'.$langs->trans("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").' ';
if (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer'))) {
if (function_exists('openssl_open')) {
- print yn($conf->global->MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING);
+ print yn(getDolGlobalInt('MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING'));
} else {
print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
}
@@ -503,11 +503,9 @@ if ($action == 'edit') {
print '';
print '';
diff --git a/htdocs/admin/order_extrafields.php b/htdocs/admin/order_extrafields.php
index 701156303bb..e11ac077cc6 100644
--- a/htdocs/admin/order_extrafields.php
+++ b/htdocs/admin/order_extrafields.php
@@ -93,12 +93,7 @@ if ($action != 'create' && $action != 'edit') {
}
-/* ************************************************************************** */
-/* */
-/* Creation of an optional field */
-/* */
-/* ************************************************************************** */
-
+// Creation of an optional field
if ($action == 'create') {
print '
';
print load_fiche_titre($langs->trans('NewAttribute'));
@@ -106,11 +101,7 @@ if ($action == 'create') {
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
-/* ************************************************************************** */
-/* */
-/* Edition of an optional field */
-/* */
-/* ************************************************************************** */
+// Edition of an optional field
if ($action == 'edit' && !empty($attrname)) {
print "
';
print load_fiche_titre($langs->trans('NewAttribute'));
@@ -107,11 +102,7 @@ if ($action == 'create') {
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
-/* ************************************************************************** */
-/* */
-/* Edition of an optional field */
-/* */
-/* ************************************************************************** */
+// Edition of an optional field
if ($action == 'edit' && !empty($attrname)) {
print " '."\n";
$sql = "SELECT r.id, r.libelle as label, r.module, r.module_position, r.perms, r.subperms, r.bydefault";
$sql .= " FROM ".MAIN_DB_PREFIX."rights_def as r";
$sql .= " WHERE r.libelle NOT LIKE 'tou%'"; // On ignore droits "tous"
-$sql .= " AND r.entity = ".$entity;
+$sql .= " AND r.entity = ".((int) $entity);
if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
$sql .= " AND r.perms NOT LIKE '%_advance'"; // Hide advanced perms if option is not enabled
}
diff --git a/htdocs/admin/reception_extrafields.php b/htdocs/admin/reception_extrafields.php
index 9dea1bf8fd7..ab7d18b1331 100644
--- a/htdocs/admin/reception_extrafields.php
+++ b/htdocs/admin/reception_extrafields.php
@@ -99,12 +99,7 @@ if ($action != 'create' && $action != 'edit') {
}
-/* ************************************************************************** */
-/* */
-/* Creation of an optional field */
-/* */
-/* ************************************************************************** */
-
+// Creation of an optional field
if ($action == 'create') {
print "
';
print load_fiche_titre($langs->trans('NewAttribute'));
@@ -106,11 +100,7 @@ if ($action == 'create') {
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
-/* ************************************************************************** */
-/* */
-/* Edition of an optional field */
-/* */
-/* ************************************************************************** */
+// Edition of an optional field
if ($action == 'edit' && !empty($attrname)) {
print "
';
print load_fiche_titre($langs->trans('NewAttribute'));
@@ -107,11 +101,7 @@ if ($action == 'create') {
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
-/* ************************************************************************** */
-/* */
-/* Edition of an optional field */
-/* */
-/* ************************************************************************** */
+// Edition of an optional field
if ($action == 'edit' && !empty($attrname)) {
print "
';
print load_fiche_titre($langs->trans('NewAttribute'));
@@ -109,11 +103,7 @@ if ($action == 'create') {
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
-/* ************************************************************************** */
-/* */
-/* Edition of an optional field */
-/* */
-/* ************************************************************************** */
+// Edition of an optional field
if ($action == 'edit' && !empty($attrname)) {
print "
';
print load_fiche_titre($langs->trans('NewAttribute'));
@@ -107,11 +101,7 @@ if ($action == 'create') {
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
-/* ************************************************************************** */
-/* */
-/* Edition of an optional field */
-/* */
-/* ************************************************************************** */
+// Edition of an optional field
if ($action == 'edit' && !empty($attrname)) {
print "
';
print load_fiche_titre($langs->trans('NewAttribute'));
@@ -108,11 +102,7 @@ if ($action == 'create') {
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
-/* ************************************************************************** */
-/* */
-/* Edition of an optional field */
-/* */
-/* ************************************************************************** */
+// Edition of an optional field
if ($action == 'edit' && !empty($attrname)) {
print "';
// Sheet format
print '
';
-print '
';
+print '
';
print $langs->trans("DescADHERENT_ETIQUETTE_TYPE").' ';
print '
';
// List of possible labels (defined into $_Avery_Labels variable set into core/lib/format_cards.lib.php)
@@ -302,7 +302,7 @@ print '
';
// Number of stickers to print
print '
';
-print '
';
+print '
';
print $langs->trans("NumberOfStickers").' ';
print '
';
print '
";
}
-
-/* ************************************************************************** */
-/* */
-/* Creation of an optional field */
-/* */
-/* ************************************************************************** */
-
+// Creation of an optional field
if ($action == 'create') {
print '
';
print load_fiche_titre($langs->trans('NewAttribute'));
@@ -100,11 +94,7 @@ if ($action == 'create') {
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
-/* ************************************************************************** */
-/* */
-/* Edition of an optional field */
-/* */
-/* ************************************************************************** */
+// Edition of an optional field
if ($action == 'edit' && !empty($attrname)) {
print "
";
print load_fiche_titre($langs->trans("FieldEdition", $attrname));
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index 9f275033b01..734f2e89506 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -208,8 +208,9 @@ if (($action == 'add' || $action == 'confirmed') && $user->rights->categorie->cr
$form = new Form($db);
$formother = new FormOther($db);
-$helpurl = 'EN:Module_Categories|FR:Module_Catégories';
-llxHeader("", $langs->trans("Categories"), $helpurl);
+$help_url = 'EN:Module_Categories|FR:Module_Catégories|DE:Modul_Kategorien';
+
+llxHeader("", $langs->trans("Categories"), $help_url);
if ($user->rights->categorie->creer) {
// Create or add
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index ba8ffe0e89f..880b0cc69df 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1300,7 +1300,7 @@ class Categorie extends CommonObject
$sql = "SELECT c.rowid";
$sql .= " FROM ".MAIN_DB_PREFIX."categorie as c ";
$sql .= " WHERE c.entity IN (".getEntity('category').")";
- $sql .= " AND c.type = ".$type;
+ $sql .= " AND c.type = ".((int) $type);
$sql .= " AND c.fk_parent = ".$this->fk_parent;
$sql .= " AND c.label = '".$this->db->escape($this->label)."'";
@@ -1792,7 +1792,7 @@ class Categorie extends CommonObject
$sql = "SELECT rowid";
$sql .= " FROM ".MAIN_DB_PREFIX."categorie_lang";
$sql .= " WHERE fk_category=".$this->id;
- $sql .= " AND lang='".$key."'";
+ $sql .= " AND lang = '".$this->db->escape($key)."'";
$result = $this->db->query($sql);
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index dedb368202d..817c750a571 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -207,8 +207,10 @@ $formother = new FormOther($db);
$arrayofjs = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.js', '/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js');
$arrayofcss = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
-$helpurl = '';
-llxHeader("", $langs->trans("Categories"), $helpurl, '', 0, 0, $arrayofjs, $arrayofcss);
+
+$help_url = '';
+
+llxHeader("", $langs->trans("Categories"), $help_url, '', 0, 0, $arrayofjs, $arrayofcss);
$title = Categorie::$MAP_TYPE_TITLE_AREA[$type];
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 391b418f5b8..db26bc4ad22 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1896,7 +1896,8 @@ if ($id > 0) {
if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
print '
'.$langs->trans("Type").' ';
print $object->getTypePicto();
- print $langs->trans($object->type).' ';
+ print $langs->trans("Action".$object->type_code);
+ print '';
}
// Full day event
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 21c130cafac..4bef5ddcd16 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -1227,17 +1227,17 @@ class ActionComm extends CommonObject
$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
if (!empty($socid)) {
- $sql .= " AND a.fk_soc = ".$socid;
+ $sql .= " AND a.fk_soc = ".((int) $socid);
}
if (!empty($elementtype)) {
if ($elementtype == 'project') {
- $sql .= ' AND a.fk_project = '.$fk_element;
+ $sql .= ' AND a.fk_project = '.((int) $fk_element);
} elseif ($elementtype == 'contact') {
$sql .= ' AND a.id IN';
$sql .= " (SELECT fk_actioncomm FROM ".MAIN_DB_PREFIX."actioncomm_resources WHERE";
- $sql .= " element_type = 'socpeople' AND fk_element = ".$fk_element.')';
+ $sql .= " element_type = 'socpeople' AND fk_element = ".((int) $fk_element).')';
} else {
- $sql .= " AND a.fk_element = ".(int) $fk_element." AND a.elementtype = '".$db->escape($elementtype)."'";
+ $sql .= " AND a.fk_element = ".((int) $fk_element)." AND a.elementtype = '".$db->escape($elementtype)."'";
}
}
if (!empty($filter)) {
diff --git a/htdocs/comm/action/class/api_agendaevents.class.php b/htdocs/comm/action/class/api_agendaevents.class.php
index 9ad3dd8ce51..5d57b9624e3 100644
--- a/htdocs/comm/action/class/api_agendaevents.class.php
+++ b/htdocs/comm/action/class/api_agendaevents.class.php
@@ -147,14 +147,14 @@ class AgendaEvents extends DolibarrApi
}
}
if ($user_ids) {
- $sql .= " AND t.fk_user_action IN (".$user_ids.")";
+ $sql .= " AND t.fk_user_action IN (".$this->db->sanitize($user_ids).")";
}
if ($socid > 0) {
- $sql .= " AND t.fk_soc = ".$socid;
+ $sql .= " AND t.fk_soc = ".((int) $socid);
}
// Insert sale filter
if ($search_sale > 0) {
- $sql .= " AND sc.fk_user = ".$search_sale;
+ $sql .= " AND sc.fk_user = ".((int) $search_sale);
}
// Add sql filters
if ($sqlfilters) {
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index 6c92f07085b..b8d443d8096 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -115,8 +115,8 @@ if ($dateselect > 0) {
}
// Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
-if (GETPOST('search_actioncode', 'array')) {
- $actioncode = GETPOST('search_actioncode', 'array', 3);
+if (GETPOST('search_actioncode', 'array:aZ09')) {
+ $actioncode = GETPOST('search_actioncode', 'array:aZ09', 3);
if (!count($actioncode)) {
$actioncode = '0';
}
@@ -669,18 +669,18 @@ if (!empty($actioncode)) {
$sql .= " AND ca.type = 'systemauto'";
} else {
if (is_array($actioncode)) {
- $sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
+ $sql .= " AND ca.code IN (".$db->sanitize("'".implode("','", $actioncode)."'", 1).")";
} else {
- $sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
+ $sql .= " AND ca.code IN (".$db->sanitize("'".implode("','", explode(',', $actioncode))."'", 1).")";
}
}
}
}
if ($resourceid > 0) {
- $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
+ $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".((int) $resourceid);
}
if ($pid) {
- $sql .= " AND a.fk_project=".$db->escape($pid);
+ $sql .= " AND a.fk_project=".((int) $pid);
}
if (!$user->rights->societe->client->voir && !$socid) {
$sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index 64ed79d87ca..888a13fb4b8 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -429,31 +429,31 @@ if (!empty($actioncode)) {
$sql .= " AND c.type = 'systemauto'";
} else {
if (is_array($actioncode)) {
- $sql .= " AND c.code IN ('".implode("','", $actioncode)."')";
+ $sql .= " AND c.code IN (".$db->sanitize("'".implode("','", $actioncode)."'", 1).")";
} else {
- $sql .= " AND c.code IN ('".implode("','", explode(',', $actioncode))."')";
+ $sql .= " AND c.code IN (".$db->sanitize("'".implode("','", explode(',', $actioncode))."'", 1).")";
}
}
}
}
if ($resourceid > 0) {
- $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
+ $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".((int) $resourceid);
}
if ($pid) {
- $sql .= " AND a.fk_project=".$db->escape($pid);
+ $sql .= " AND a.fk_project=".((int) $pid);
}
if (!$user->rights->societe->client->voir && !$socid) {
$sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
}
if ($socid > 0) {
- $sql .= " AND s.rowid = ".$socid;
+ $sql .= " AND s.rowid = ".((int) $socid);
}
// We must filter on assignement table
if ($filtert > 0 || $usergroup > 0) {
$sql .= " AND ar.fk_actioncomm = a.id AND ar.element_type='user'";
}
if ($type) {
- $sql .= " AND c.id = ".(int) $type;
+ $sql .= " AND c.id = ".((int) $type);
}
if ($search_status == '0') {
$sql .= " AND a.percent = 0";
@@ -486,10 +486,10 @@ if ($search_note) {
if ($filtert > 0 || $usergroup > 0) {
$sql .= " AND (";
if ($filtert > 0) {
- $sql .= "(ar.fk_element = ".$filtert." OR (ar.fk_element IS NULL AND a.fk_user_action=".$filtert."))"; // The OR is for backward compatibility
+ $sql .= "(ar.fk_element = ".((int) $filtert)." OR (ar.fk_element IS NULL AND a.fk_user_action = ".((int) $filtert)."))"; // The OR is for backward compatibility
}
if ($usergroup > 0) {
- $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".$usergroup;
+ $sql .= ($filtert > 0 ? " OR " : "")." ugu.fk_usergroup = ".((int) $usergroup);
}
$sql .= ")";
}
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index dc70fb30743..3b55399a58a 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -540,24 +540,24 @@ if (!empty($actioncode)) {
$sql .= " AND ca.type = 'systemauto'";
} else {
if (is_array($actioncode)) {
- $sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
+ $sql .= " AND ca.code IN (".$db->sanitize("'".implode("','", $actioncode)."'", 1).")";
} else {
- $sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
+ $sql .= " AND ca.code IN (".$db->sanitize("'".implode("','", explode(',', $actioncode))."'", 1).")";
}
}
}
}
if ($resourceid > 0) {
- $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
+ $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".((int) $resourceid);
}
if ($pid) {
- $sql .= " AND a.fk_project=".$db->escape($pid);
+ $sql .= " AND a.fk_project=".((int) $pid);
}
if (!$user->rights->societe->client->voir && !$socid) {
$sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
}
if ($socid > 0) {
- $sql .= ' AND a.fk_soc = '.$socid;
+ $sql .= ' AND a.fk_soc = '.((int) $socid);
}
// We must filter on assignement table
if ($filtert > 0 || $usergroup > 0) {
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 388363f63fc..8c440395083 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -105,8 +105,8 @@ $type = GETPOST("search_type", 'alpha') ?GETPOST("search_type", 'alpha') : GETPO
$maxprint = ((GETPOST("maxprint", 'int') != '') ?GETPOST("maxprint", 'int') : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
// Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
-if (GETPOST('search_actioncode', 'array')) {
- $actioncode = GETPOST('search_actioncode', 'array', 3);
+if (GETPOST('search_actioncode', 'array:aZ09')) {
+ $actioncode = GETPOST('search_actioncode', 'array:aZ09', 3);
if (!count($actioncode)) {
$actioncode = '0';
}
@@ -562,24 +562,24 @@ if (!empty($actioncode)) {
$sql .= " AND ca.type = 'systemauto'";
} else {
if (is_array($actioncode)) {
- $sql .= " AND ca.code IN ('".implode("','", $actioncode)."')";
+ $sql .= " AND ca.code IN (".$db->sanitize("'".implode("','", $actioncode)."'", 1).")";
} else {
- $sql .= " AND ca.code IN ('".implode("','", explode(',', $actioncode))."')";
+ $sql .= " AND ca.code IN (".$db->sanitize("'".implode("','", explode(',', $actioncode))."'", 1).")";
}
}
}
}
if ($resourceid > 0) {
- $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".$db->escape($resourceid);
+ $sql .= " AND r.element_type = 'action' AND r.element_id = a.id AND r.resource_id = ".((int) $resourceid);
}
if ($pid) {
- $sql .= " AND a.fk_project=".$db->escape($pid);
+ $sql .= " AND a.fk_project = ".((int) $pid);
}
if (!$user->rights->societe->client->voir && !$socid) {
$sql .= " AND (a.fk_soc IS NULL OR sc.fk_user = ".$user->id.")";
}
if ($socid > 0) {
- $sql .= ' AND a.fk_soc = '.$socid;
+ $sql .= ' AND a.fk_soc = '.((int) $socid);
}
// We must filter on assignement table
if ($filtert > 0 || $usergroup > 0) {
diff --git a/htdocs/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php
index e314d0b3e66..bfa62eba7fc 100644
--- a/htdocs/comm/admin/propal_extrafields.php
+++ b/htdocs/comm/admin/propal_extrafields.php
@@ -86,13 +86,7 @@ if ($action != 'create' && $action != 'edit') {
print "
";
}
-
-/* ************************************************************************** */
-/* */
-/* Creation of an optional field */
-/* */
-/* ************************************************************************** */
-
+// Creation of an optional field
if ($action == 'create') {
print "
";
print load_fiche_titre($langs->trans('NewAttribute'));
@@ -100,11 +94,7 @@ if ($action == 'create') {
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
-/* ************************************************************************** */
-/* */
-/* Edition of an optional field */
-/* */
-/* ************************************************************************** */
+// Edition of an optional field
if ($action == 'edit' && !empty($attrname)) {
print "
";
print load_fiche_titre($langs->trans("FieldEdition", $attrname));
diff --git a/htdocs/comm/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php
index 4cbe35b31c5..834722f2afd 100644
--- a/htdocs/comm/admin/propaldet_extrafields.php
+++ b/htdocs/comm/admin/propaldet_extrafields.php
@@ -94,13 +94,7 @@ if ($action != 'create' && $action != 'edit') {
print "
";
}
-
-/* ************************************************************************** */
-/* */
-/* Creation of an optional field */
-/* */
-/* ************************************************************************** */
-
+// Creation of an optional field
if ($action == 'create') {
print '
';
print load_fiche_titre($langs->trans('NewAttribute'));
@@ -108,11 +102,7 @@ if ($action == 'create') {
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
-/* ************************************************************************** */
-/* */
-/* Edition of an optional field */
-/* */
-/* ************************************************************************** */
+// Edition of an optional field
if ($action == 'edit' && !empty($attrname)) {
print "
";
print load_fiche_titre($langs->trans("FieldEdition", $attrname));
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index b1e8b3c3768..8a921e1c358 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -101,7 +101,7 @@ if ($type == "f") {
$sql .= " AND s.fournisseur = 1";
}
if ($socid) {
- $sql .= " AND s.rowid = ".$socid;
+ $sql .= " AND s.rowid = ".((int) $socid);
}
if (dol_strlen($stcomm)) {
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index b720ff638c9..b727a18b76f 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -169,7 +169,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
}
if ($socid) {
- $sql .= " AND s.rowid = ".$socid;
+ $sql .= " AND s.rowid = ".((int) $socid);
}
$resql = $db->query($sql);
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index c811b673197..063fb6c7f00 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -559,34 +559,34 @@ class AdvanceTargetingMailing extends CommonObject
$sqlwhere[] = " (t.parent IN (SELECT rowid FROM ".MAIN_DB_PREFIX."societe WHERE (".$str.")))";
}
if (!empty($arrayquery['cust_status']) && count($arrayquery['cust_status']) > 0) {
- $sqlwhere[] = " (t.status IN (".implode(',', $arrayquery['cust_status'])."))";
+ $sqlwhere[] = " (t.status IN (".$this->db->sanitize(implode(',', $arrayquery['cust_status']))."))";
}
if (!empty($arrayquery['cust_typecust']) && count($arrayquery['cust_typecust']) > 0) {
- $sqlwhere[] = " (t.client IN (".implode(',', $arrayquery['cust_typecust'])."))";
+ $sqlwhere[] = " (t.client IN (".$this->db->sanitize(implode(',', $arrayquery['cust_typecust']))."))";
}
if (!empty($arrayquery['cust_comm_status']) && count($arrayquery['cust_comm_status'] > 0)) {
- $sqlwhere[] = " (t.fk_stcomm IN (".implode(',', $arrayquery['cust_comm_status'])."))";
+ $sqlwhere[] = " (t.fk_stcomm IN (".$this->db->sanitize(implode(',', $arrayquery['cust_comm_status']))."))";
}
if (!empty($arrayquery['cust_prospect_status']) && count($arrayquery['cust_prospect_status']) > 0) {
- $sqlwhere[] = " (t.fk_prospectlevel IN ('".implode("','", $arrayquery['cust_prospect_status'])."'))";
+ $sqlwhere[] = " (t.fk_prospectlevel IN (".$this->db->sanitize("'".implode("','", $arrayquery['cust_prospect_status'])."'", 1)."))";
}
if (!empty($arrayquery['cust_typeent']) && count($arrayquery['cust_typeent']) > 0) {
- $sqlwhere[] = " (t.fk_typent IN (".implode(',', $arrayquery['cust_typeent'])."))";
+ $sqlwhere[] = " (t.fk_typent IN (".$this->db->sanitize(implode(',', $arrayquery['cust_typeent']))."))";
}
if (!empty($arrayquery['cust_saleman']) && count($arrayquery['cust_saleman']) > 0) {
- $sqlwhere[] = " (saleman.fk_user IN (".implode(',', $arrayquery['cust_saleman'])."))";
+ $sqlwhere[] = " (saleman.fk_user IN (".$this->db->sanitize(implode(',', $arrayquery['cust_saleman']))."))";
}
if (!empty($arrayquery['cust_country']) && count($arrayquery['cust_country']) > 0) {
- $sqlwhere[] = " (t.fk_pays IN (".implode(',', $arrayquery['cust_country'])."))";
+ $sqlwhere[] = " (t.fk_pays IN (".$this->db->sanitize(implode(',', $arrayquery['cust_country']))."))";
}
if (!empty($arrayquery['cust_effectif_id']) && count($arrayquery['cust_effectif_id']) > 0) {
- $sqlwhere[] = " (t.fk_effectif IN (".implode(',', $arrayquery['cust_effectif_id'])."))";
+ $sqlwhere[] = " (t.fk_effectif IN (".$this->db->sanitize(implode(',', $arrayquery['cust_effectif_id']))."))";
}
if (!empty($arrayquery['cust_categ']) && count($arrayquery['cust_categ']) > 0) {
- $sqlwhere[] = " (custcateg.fk_categorie IN (".implode(',', $arrayquery['cust_categ'])."))";
+ $sqlwhere[] = " (custcateg.fk_categorie IN (".$this->db->sanitize(implode(',', $arrayquery['cust_categ']))."))";
}
if (!empty($arrayquery['cust_language']) && count($arrayquery['cust_language']) > 0) {
- $sqlwhere[] = " (t.default_lang IN ('".implode("','", $arrayquery['cust_language'])."'))";
+ $sqlwhere[] = " (t.default_lang IN (".$this->db->sanitize("'".implode("','", $arrayquery['cust_language'])."'", 1)."))";
}
//Standard Extrafield feature
@@ -618,7 +618,7 @@ class AdvanceTargetingMailing extends CommonObject
}
} else {
if (is_array($arrayquery['options_'.$key])) {
- $sqlwhere[] = " (te.".$key." IN ('".implode("','", $arrayquery['options_'.$key])."'))";
+ $sqlwhere[] = " (te.".$key." IN (".$this->db->sanitize("'".implode("','", $arrayquery['options_'.$key])."'", 1)."))";
} elseif (!empty($arrayquery['options_'.$key])) {
$sqlwhere[] = " (te.".$key." LIKE '".$this->db->escape($arrayquery['options_'.$key])."')";
}
@@ -703,7 +703,7 @@ class AdvanceTargetingMailing extends CommonObject
$sqlwhere[] = " (t.statut IN (".$this->db->sanitize($this->db->escape(implode(',', $arrayquery['contact_status'])))."))";
}
if (!empty($arrayquery['contact_civility']) && count($arrayquery['contact_civility']) > 0) {
- $sqlwhere[] = " (t.civility IN ('".$this->db->sanitize($this->db->escape(implode("','", $arrayquery['contact_civility'])))."'))";
+ $sqlwhere[] = " (t.civility IN (".$this->db->sanitize("'".implode("','", $arrayquery['contact_civility'])."'", 1)."))";
}
if ($arrayquery['contact_no_email'] != '') {
$tmpwhere = '';
@@ -762,7 +762,7 @@ class AdvanceTargetingMailing extends CommonObject
}
} else {
if (is_array($arrayquery['options_'.$key.'_cnct'])) {
- $sqlwhere[] = " (te.".$key." IN ('".implode("','", $arrayquery['options_'.$key.'_cnct'])."'))";
+ $sqlwhere[] = " (te.".$key." IN (".$this->db->sanitize("'".implode("','", $arrayquery['options_'.$key.'_cnct'])."'", 1)."))";
} elseif (!empty($arrayquery['options_'.$key.'_cnct'])) {
$sqlwhere[] = " (te.".$key." LIKE '".$this->db->escape($arrayquery['options_'.$key.'_cnct'])."')";
}
@@ -797,34 +797,34 @@ class AdvanceTargetingMailing extends CommonObject
$sqlwhere[] = " (ts.parent IN (SELECT rowid FROM ".MAIN_DB_PREFIX."societe WHERE (".$str.")))";
}
if (!empty($arrayquery['cust_status']) && count($arrayquery['cust_status']) > 0) {
- $sqlwhere[] = " (ts.status IN (".implode(',', $arrayquery['cust_status'])."))";
+ $sqlwhere[] = " (ts.status IN (".$this->db->sanitize(implode(',', $arrayquery['cust_status']))."))";
}
if (!empty($arrayquery['cust_typecust']) && count($arrayquery['cust_typecust']) > 0) {
- $sqlwhere[] = " (ts.client IN (".implode(',', $arrayquery['cust_typecust'])."))";
+ $sqlwhere[] = " (ts.client IN (".$this->db->sanitize(implode(',', $arrayquery['cust_typecust']))."))";
}
if (!empty($arrayquery['cust_comm_status']) && count($arrayquery['cust_comm_status'] > 0)) {
- $sqlwhere[] = " (ts.fk_stcomm IN (".implode(',', $arrayquery['cust_comm_status'])."))";
+ $sqlwhere[] = " (ts.fk_stcomm IN (".$this->db->sanitize(implode(',', $arrayquery['cust_comm_status']))."))";
}
if (!empty($arrayquery['cust_prospect_status']) && count($arrayquery['cust_prospect_status']) > 0) {
- $sqlwhere[] = " (ts.fk_prospectlevel IN ('".implode("','", $arrayquery['cust_prospect_status'])."'))";
+ $sqlwhere[] = " (ts.fk_prospectlevel IN ('".$this->db->sanitize(implode("','", $arrayquery['cust_prospect_status']))."'))";
}
if (!empty($arrayquery['cust_typeent']) && count($arrayquery['cust_typeent']) > 0) {
- $sqlwhere[] = " (ts.fk_typent IN (".implode(',', $arrayquery['cust_typeent'])."))";
+ $sqlwhere[] = " (ts.fk_typent IN (".$this->db->sanitize(implode(',', $arrayquery['cust_typeent']))."))";
}
if (!empty($arrayquery['cust_saleman']) && count($arrayquery['cust_saleman']) > 0) {
- $sqlwhere[] = " (saleman.fk_user IN (".implode(',', $arrayquery['cust_saleman'])."))";
+ $sqlwhere[] = " (saleman.fk_user IN (".$this->db->sanitize(implode(',', $arrayquery['cust_saleman']))."))";
}
if (!empty($arrayquery['cust_country']) && count($arrayquery['cust_country']) > 0) {
- $sqlwhere[] = " (ts.fk_pays IN (".implode(',', $arrayquery['cust_country'])."))";
+ $sqlwhere[] = " (ts.fk_pays IN (".$this->db->sanitize(implode(',', $arrayquery['cust_country']))."))";
}
if (!empty($arrayquery['cust_effectif_id']) && count($arrayquery['cust_effectif_id']) > 0) {
- $sqlwhere[] = " (ts.fk_effectif IN (".implode(',', $arrayquery['cust_effectif_id'])."))";
+ $sqlwhere[] = " (ts.fk_effectif IN (".$this->db->sanitize(implode(',', $arrayquery['cust_effectif_id']))."))";
}
if (!empty($arrayquery['cust_categ']) && count($arrayquery['cust_categ']) > 0) {
- $sqlwhere[] = " (custcateg.fk_categorie IN (".implode(',', $arrayquery['cust_categ'])."))";
+ $sqlwhere[] = " (custcateg.fk_categorie IN (".$this->db->sanitize(implode(',', $arrayquery['cust_categ']))."))";
}
if (!empty($arrayquery['cust_language']) && count($arrayquery['cust_language']) > 0) {
- $sqlwhere[] = " (ts.default_lang IN ('".implode("','", $arrayquery['cust_language'])."'))";
+ $sqlwhere[] = " (ts.default_lang IN ('".$this->db->sanitize(implode("','", $arrayquery['cust_language']))."'))";
}
//Standard Extrafield feature
@@ -860,7 +860,7 @@ class AdvanceTargetingMailing extends CommonObject
}
} else {
if (is_array($arrayquery['options_'.$key])) {
- $sqlwhere[] = " (tse.".$key." IN ('".implode("','", $arrayquery['options_'.$key])."'))";
+ $sqlwhere[] = " (tse.".$key." IN (".$this->db->sanitize("'".implode("','", $arrayquery['options_'.$key])."'", 1)."))";
} elseif (!empty($arrayquery['options_'.$key])) {
$sqlwhere[] = " (tse.".$key." LIKE '".$this->db->escape($arrayquery['options_'.$key])."')";
}
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 2b27d7ee451..c8c94e7e95a 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -300,6 +300,7 @@ if (empty($reshook)) {
}
} elseif ($action == 'setecheance' && $usercancreate) {
$result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']));
+ $result = $object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
if ($result < 0) {
dol_print_error($db, $object->error);
}
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index 84d7cf23385..9f5cdea8000 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -181,14 +181,14 @@ class Proposals extends DolibarrApi
$sql .= " AND t.fk_soc = sc.fk_soc";
}
if ($socids) {
- $sql .= " AND t.fk_soc IN (".$socids.")";
+ $sql .= " AND t.fk_soc IN (".$this->db->sanitize($socids).")";
}
if ($search_sale > 0) {
$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
}
// Insert sale filter
if ($search_sale > 0) {
- $sql .= " AND sc.fk_user = ".$search_sale;
+ $sql .= " AND sc.fk_user = ".((int) $search_sale);
}
// Add sql filters
if ($sqlfilters) {
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 197c9c7074f..3674356af20 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -2734,7 +2734,7 @@ class Propal extends CommonObject
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
}
if ($socid) {
- $sql .= " AND s.rowid = ".$socid;
+ $sql .= " AND s.rowid = ".((int) $socid);
}
if ($draft) {
$sql .= " AND p.fk_statut = ".self::STATUS_DRAFT;
@@ -2821,7 +2821,7 @@ class Propal extends CommonObject
if (count($linkedInvoices) > 0) {
$sql = "SELECT rowid as facid, ref, total, datef as df, fk_user_author, fk_statut, paye";
$sql .= " FROM ".MAIN_DB_PREFIX."facture";
- $sql .= " WHERE rowid IN (".implode(',', $linkedInvoices).")";
+ $sql .= " WHERE rowid IN (".$this->db->sanitize(implode(',', $linkedInvoices)).")";
dol_syslog(get_class($this)."::InvoiceArrayList", LOG_DEBUG);
$resql = $this->db->query($sql);
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 812561a63b1..2005e51571b 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -106,7 +106,7 @@ if ($user->socid) {
if (!$user->rights->societe->client->voir && !$socid) {
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
}
-$sql .= " AND p.fk_statut IN (".implode(" ,", $listofstatus).")";
+$sql .= " AND p.fk_statut IN (".$db->sanitize(implode(" ,", $listofstatus)).")";
$sql .= " GROUP BY p.fk_statut";
$resql = $db->query($sql);
if ($resql) {
@@ -372,7 +372,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propale->lire) {
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
}
if ($socid) {
- $sql .= " AND s.rowid = ".$socid;
+ $sql .= " AND s.rowid = ".((int) $socid);
}
$sql .= " ORDER BY p.rowid DESC";
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 4c8ee0894f5..b4c63365bf8 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -565,7 +565,7 @@ if ($socid > 0) {
$sql .= ' AND s.rowid = '.$socid;
}
if ($search_status != '' && $search_status != '-1') {
- $sql .= ' AND p.fk_statut IN ('.$db->sanitize($db->escape($search_status)).')';
+ $sql .= ' AND p.fk_statut IN ('.$db->sanitize($search_status).')';
}
if ($search_date_start) {
$sql .= " AND p.datep >= '".$db->idate($search_date_start)."'";
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 3cb6de90a8d..4ae18df12f8 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -103,7 +103,7 @@ dol_mkdir($dir);
$stats = new PropaleStats($db, $socid, ($userid > 0 ? $userid : 0), $mode, ($typent_id > 0 ? $typent_id : 0), ($categ_id > 0 ? $categ_id : 0));
if ($object_status != '' && $object_status >= 0) {
- $stats->where .= ' AND p.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
+ $stats->where .= ' AND p.fk_statut IN ('.$db->sanitize($object_status).')';
}
// Build graphic number of object
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 768e6a78c70..17b7d4285b4 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -184,14 +184,14 @@ class Orders extends DolibarrApi
$sql .= " AND t.fk_soc = sc.fk_soc";
}
if ($socids) {
- $sql .= " AND t.fk_soc IN (".$socids.")";
+ $sql .= " AND t.fk_soc IN (".$this->db->sanitize($socids).")";
}
if ($search_sale > 0) {
$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
}
// Insert sale filter
if ($search_sale > 0) {
- $sql .= " AND sc.fk_user = ".$search_sale;
+ $sql .= " AND sc.fk_user = ".((int) $search_sale);
}
// Add sql filters
if ($sqlfilters) {
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index b29b594f8f2..14fc65cf18d 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -2300,8 +2300,8 @@ class Commande extends CommonOrder
if (count($array_of_product)) {
$sql = "SELECT fk_product, sum(ps.reel) as total";
$sql .= " FROM ".MAIN_DB_PREFIX."product_stock as ps";
- $sql .= " WHERE ps.fk_product IN (".join(',', $array_of_product).")";
- $sql .= ' GROUP BY fk_product ';
+ $sql .= " WHERE ps.fk_product IN (".$this->db->sanitize(join(',', $array_of_product)).")";
+ $sql .= ' GROUP BY fk_product';
$resql = $this->db->query($sql);
if ($resql) {
$num = $this->db->num_rows($resql);
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 4b6fcc7d8aa..66798c94157 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -209,7 +209,7 @@ if (!empty($conf->commande->enabled)) {
$sql .= " AND c.entity IN (".getEntity('commande').")";
$sql .= " AND c.fk_statut = 0";
if ($socid) {
- $sql .= " AND c.fk_soc = ".$socid;
+ $sql .= " AND c.fk_soc = ".((int) $socid);
}
if (!$user->rights->societe->client->voir && !$socid) {
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 73ac91c7098..117f7557db3 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -426,10 +426,10 @@ if ($search_state) {
$sql .= natural_search("state.nom", $search_state);
}
if ($search_country) {
- $sql .= " AND s.fk_pays IN (".$search_country.')';
+ $sql .= " AND s.fk_pays IN (".$db->sanitize($search_country).')';
}
if ($search_type_thirdparty) {
- $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
+ $sql .= " AND s.fk_typent IN (".$db->sanitize($search_type_thirdparty).')';
}
if ($search_company) {
$sql .= natural_search('s.nom', $search_company);
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 0c9b80c3883..090d07baf81 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -96,12 +96,12 @@ dol_mkdir($dir);
$stats = new CommandeStats($db, $socid, $mode, ($userid > 0 ? $userid : 0), ($typent_id > 0 ? $typent_id : 0), ($categ_id > 0 ? $categ_id : 0));
if ($mode == 'customer') {
if ($object_status != '' && $object_status >= -1) {
- $stats->where .= ' AND c.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
+ $stats->where .= ' AND c.fk_statut IN ('.$db->sanitize($object_status).')';
}
}
if ($mode == 'supplier') {
if ($object_status != '' && $object_status >= 0) {
- $stats->where .= ' AND c.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
+ $stats->where .= ' AND c.fk_statut IN ('.$db->sanitize($object_status).')';
}
}
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 596abdf0e97..d369f36c32f 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -34,6 +34,7 @@ if ((array_key_exists('action', $_GET) && $_GET['action'] == 'dl') || (array_key
require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
require_once DOL_DOCUMENT_ROOT.'/salaries/class/paymentsalary.class.php';
@@ -56,13 +57,12 @@ $date_start = GETPOST('date_start', 'alpha');
$date_startDay = GETPOST('date_startday', 'int');
$date_startMonth = GETPOST('date_startmonth', 'int');
$date_startYear = GETPOST('date_startyear', 'int');
-$date_start = ($date_startDay) ?dol_mktime(0, 0, 0, $date_startMonth, $date_startDay, $date_startYear) : strtotime($date_start);
+$date_start = ($date_startDay ? dol_mktime(0, 0, 0, $date_startMonth, $date_startDay, $date_startYear, 'tzuserrel') : dol_stringtotime($date_start));
$date_stop = GETPOST('date_stop', 'alpha');
$date_stopDay = GETPOST('date_stopday', 'int');
$date_stopMonth = GETPOST('date_stopmonth', 'int');
$date_stopYear = GETPOST('date_stopyear', 'int');
-//FIXME doldate
-$date_stop = ($date_stopDay) ?dol_mktime(23, 59, 59, $date_stopMonth, $date_stopDay, $date_stopYear) : strtotime($date_stop);
+$date_stop = ($date_stopDay ? dol_mktime(23, 59, 59, $date_stopMonth, $date_stopDay, $date_stopYear, 'tzuserrel') : dol_stringtotime($date_stop));
$action = GETPOST('action', 'aZ09');
// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -126,6 +126,17 @@ if (empty($entity)) {
$error = 0;
+$listofchoices = array(
+ 'selectinvoices'=>array('label'=>'Invoices', 'lang'=>'bills', 'enabled' => !empty($conf->facture->enabled), 'perms' => !empty($user->rights->facture->lire)),
+ 'selectsupplierinvoices'=>array('label'=>'BillsSuppliers', 'lang'=>'bills', 'enabled' => !empty($conf->supplier_invoice->enabled), 'perms' => !empty($user->rights->fournisseur->facture->lire)),
+ 'selectexpensereports'=>array('label'=>'ExpenseReports', 'lang'=>'trips', 'enabled' => !empty($conf->expensereport->enabled), 'perms' => !empty($user->rights->expensereport->lire)),
+ 'selectdonations'=>array('label'=>'Donations', 'lang'=>'donation', 'enabled' => !empty($conf->don->enabled), 'perms' => !empty($user->rights->don->lire)),
+ 'selectsocialcontributions'=>array('label'=>'SocialContributions', 'enabled' => !empty($conf->tax->enabled), 'perms' => !empty($user->rights->tax->charges->lire)),
+ 'selectpaymentsofsalaries'=>array('label'=>'SalariesPayments', 'lang'=>'salaries', 'enabled' => !empty($conf->salaries->enabled), 'perms' => !empty($user->rights->salaries->read)),
+ 'selectvariouspayment'=>array('label'=>'VariousPayment', 'enabled' => !empty($conf->banque->enabled), 'perms' => !empty($user->rights->banque->lire)),
+ 'selectloanspayment'=>array('label'=>'PaymentLoan', 'enabled' => !empty($conf->loan->enabled), 'perms' => !empty($user->rights->loan->read)),
+);
+
/*
@@ -155,90 +166,90 @@ if (($action == 'searchfiles' || $action == 'dl')) {
$wheretail = " '".$db->idate($date_start)."' AND '".$db->idate($date_stop)."'";
// Customer invoices
- if (GETPOST('selectinvoices')) {
+ if (GETPOST('selectinvoices') && !empty($listofchoices['selectinvoices']['perms'])) {
if (!empty($sql)) {
$sql .= " UNION ALL";
}
$sql .= "SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total as total_ht, t.total_ttc, t.tva as total_vat, t.multicurrency_code as currency, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'Invoice' as item, s.nom as thirdparty_name, s.code_client as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_CREDIT." as sens";
$sql .= " FROM ".MAIN_DB_PREFIX."facture as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
$sql .= " WHERE datef between ".$wheretail;
- $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+ $sql .= " AND t.entity IN (".$db->sanitize($entity == 1 ? '0,1' : $entity).')';
$sql .= " AND t.fk_statut <> ".Facture::STATUS_DRAFT;
}
// Vendor invoices
- if (GETPOST('selectsupplierinvoices')) {
+ if (GETPOST('selectsupplierinvoices') && !empty($listofchoices['selectsupplierinvoices']['perms'])) {
if (!empty($sql)) {
$sql .= " UNION ALL";
}
$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paye as paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.multicurrency_code as currency, t.fk_soc, t.datef as date, t.date_lim_reglement as date_due, 'SupplierInvoice' as item, s.nom as thirdparty_name, s.code_fournisseur as thirdparty_code, c.code as country_code, s.tva_intra as vatnum, ".PAY_DEBIT." as sens";
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as t LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = t.fk_soc LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
$sql .= " WHERE datef between ".$wheretail;
- $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+ $sql .= " AND t.entity IN (".$db->sanitize($entity == 1 ? '0,1' : $entity).')';
$sql .= " AND t.fk_statut <> ".FactureFournisseur::STATUS_DRAFT;
}
// Expense reports
- if (GETPOST('selectexpensereports')) {
+ if (GETPOST('selectexpensereports') && !empty($listofchoices['selectexpensereports']['perms'])) {
if (!empty($sql)) {
$sql .= " UNION ALL";
}
$sql .= " SELECT t.rowid as id, t.entity, t.ref, t.paid, t.total_ht, t.total_ttc, t.total_tva as total_vat, t.multicurrency_code as currency, t.fk_user_author as fk_soc, t.date_fin as date, t.date_fin as date_due, 'ExpenseReport' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname) as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user_author LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
$sql .= " WHERE date_fin between ".$wheretail;
- $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+ $sql .= " AND t.entity IN (".$db->sanitize($entity == 1 ? '0,1' : $entity).')';
$sql .= " AND t.fk_statut <> ".ExpenseReport::STATUS_DRAFT;
}
// Donations
- if (GETPOST('selectdonations')) {
+ if (GETPOST('selectdonations') && !empty($listofchoices['selectdonations']['perms'])) {
if (!empty($sql)) {
$sql .= " UNION ALL";
}
$sql .= " SELECT t.rowid as id, t.entity, t.ref, paid, amount as total_ht, amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.datedon as date, t.datedon as date_due, 'Donation' as item, t.societe as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_CREDIT." as sens";
$sql .= " FROM ".MAIN_DB_PREFIX."don as t LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = t.fk_country";
$sql .= " WHERE datedon between ".$wheretail;
- $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+ $sql .= " AND t.entity IN (".$db->sanitize($entity == 1 ? '0,1' : $entity).')';
$sql .= " AND t.fk_statut <> ".Don::STATUS_DRAFT;
}
// Payments of salaries
- if (GETPOST('selectpaymentsofsalaries')) {
+ if (GETPOST('selectpaymentsofsalaries') && !empty($listofchoices['selectpaymentsofsalaries']['perms'])) {
if (!empty($sql)) {
$sql .= " UNION ALL";
}
$sql .= " SELECT t.rowid as id, t.entity, t.label as ref, 1 as paid, amount as total_ht, amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, t.fk_user as fk_soc, t.datep as date, t.dateep as date_due, 'SalaryPayment' as item, CONCAT(CONCAT(u.lastname, ' '), u.firstname) as thirdparty_name, '' as thirdparty_code, c.code as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
$sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as t LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = t.fk_user LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = u.fk_country";
$sql .= " WHERE datep between ".$wheretail;
- $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+ $sql .= " AND t.entity IN (".$db->sanitize($entity == 1 ? '0,1' : $entity).')';
//$sql.=" AND fk_statut <> ".PaymentSalary::STATUS_DRAFT;
}
// Social contributions
- if (GETPOST('selectsocialcontributions')) {
+ if (GETPOST('selectsocialcontributions') && !empty($listofchoices['selectsocialcontributions']['perms'])) {
if (!empty($sql)) {
$sql .= " UNION ALL";
}
$sql .= " SELECT t.rowid as id, t.entity, t.libelle as ref, t.paye as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.date_ech as date, t.periode as date_due, 'SocialContributions' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as t";
$sql .= " WHERE t.date_ech between ".$wheretail;
- $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+ $sql .= " AND t.entity IN (".$db->sanitize($entity == 1 ? '0,1' : $entity).')';
//$sql.=" AND fk_statut <> ".ChargeSociales::STATUS_DRAFT;
}
// Various payments
- if (GETPOST('selectvariouspayment')) {
+ if (GETPOST('selectvariouspayment') && !empty($listofchoices['selectvariouspayment']['perms'])) {
if (!empty($sql)) {
$sql .= " UNION ALL";
}
$sql .= " SELECT t.rowid as id, t.entity, t.ref, 1 as paid, t.amount as total_ht, t.amount as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.datep as date, t.datep as date_due, 'VariousPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, sens";
$sql .= " FROM ".MAIN_DB_PREFIX."payment_various as t";
$sql .= " WHERE datep between ".$wheretail;
- $sql .= " AND t.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+ $sql .= " AND t.entity IN (".$db->sanitize($entity == 1 ? '0,1' : $entity).')';
}
// Loan payments
- if (GETPOST('selectloanspayment')) {
+ if (GETPOST('selectloanspayment') && !empty($listofchoices['selectloanspayment']['perms'])) {
if (!empty($sql)) {
$sql .= " UNION ALL";
}
$sql .= " SELECT t.rowid as id, l.entity, l.label as ref, 1 as paid, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ht, (t.amount_capital+t.amount_insurance+t.amount_interest) as total_ttc, 0 as total_vat, '".$db->escape($conf->currency)."' as currency, 0 as fk_soc, t.datep as date, t.datep as date_due, 'LoanPayment' as item, '' as thirdparty_name, '' as thirdparty_code, '' as country_code, '' as vatnum, ".PAY_DEBIT." as sens";
$sql .= " FROM ".MAIN_DB_PREFIX."payment_loan as t LEFT JOIN ".MAIN_DB_PREFIX."loan as l ON l.rowid = t.fk_loan";
$sql .= " WHERE datep between ".$wheretail;
- $sql .= " AND l.entity IN (".($entity == 1 ? '0,1' : $entity).')';
+ $sql .= " AND l.entity IN (".$db->sanitize($entity == 1 ? '0,1' : $entity).')';
}
if ($sql) {
@@ -539,8 +550,11 @@ print '
';
print '
'.$langs->trans("ExportAccountingSourceDocHelp", $langs->transnoentitiesnoconv("Accounting"), $langs->transnoentitiesnoconv("Journals")).' ';
print '
';
-print $langs->trans("ReportPeriod").': '.$form->selectDate($date_start, 'date_start', 0, 0, 0, "", 1, 1, 0);
-print ' - '.$form->selectDate($date_stop, 'date_stop', 0, 0, 0, "", 1, 1, 0)."\n";
+print $langs->trans("ReportPeriod").': ';
+print $form->selectDate($date_start, 'date_start', 0, 0, 0, "", 1, 1, 0, '', '', '', '', 1, '', '', 'tzuserrel');
+print ' - ';
+print $form->selectDate($date_stop, 'date_stop', 0, 0, 0, "", 1, 1, 0, '', '', '', '', 1, '', '', 'tzuserrel');
+print "\n";
// Export is for current company only
if (!empty($conf->multicompany->enabled) && is_object($mc)) {
@@ -558,22 +572,16 @@ if (!empty($conf->multicompany->enabled) && is_object($mc)) {
print '
';
-$listofchoices = array(
- 'selectinvoices'=>array('label'=>'Invoices', 'lang'=>'bills', 'enabled' => !empty($conf->facture->enabled)),
- 'selectsupplierinvoices'=>array('label'=>'BillsSuppliers', 'lang'=>'bills', 'enabled' => !empty($conf->supplier_invoice->enabled)),
- 'selectexpensereports'=>array('label'=>'ExpenseReports', 'lang'=>'trips', 'enabled' => !empty($conf->expensereport->enabled)),
- 'selectdonations'=>array('label'=>'Donations', 'lang'=>'donation', 'enabled' => !empty($conf->don->enabled)),
- 'selectsocialcontributions'=>array('label'=>'SocialContributions', 'enabled' => !empty($conf->tax->enabled)),
- 'selectpaymentsofsalaries'=>array('label'=>'SalariesPayments', 'lang'=>'salaries', 'enabled' => !empty($conf->salaries->enabled)),
- 'selectvariouspayment'=>array('label'=>'VariousPayment', 'enabled' => !empty($conf->banque->enabled)),
- 'selectloanspayment'=>array('label'=>'PaymentLoan', 'enabled' => !empty($conf->loan->enabled)),
-);
foreach ($listofchoices as $choice => $val) {
if (empty($val['enabled'])) {
continue; // list not qualified
}
+ $disabled = '';
+ if (empty($val['perms'])) {
+ $disabled = ' disabled';
+ }
$checked = (((!GETPOSTISSET('search') && $action != 'searchfiles') || GETPOST($choice)) ? ' checked="checked"' : '');
- print '
'.$langs->trans($val['label']).'
';
+ print '
'.$langs->trans($val['label']).'
';
}
print '
';
diff --git a/htdocs/compta/bank/account_statement_document.php b/htdocs/compta/bank/account_statement_document.php
index ea4911e7050..e144f6acbe0 100644
--- a/htdocs/compta/bank/account_statement_document.php
+++ b/htdocs/compta/bank/account_statement_document.php
@@ -79,12 +79,12 @@ $result = restrictedArea($user, 'banque', $object->id, 'bank_account', '', '');
// Define number of receipt to show (current, previous or next one ?)
$found = false;
-if ($_GET["rel"] == 'prev') {
+if (GETPOST("rel") == 'prev') {
// Recherche valeur pour num = numero releve precedent
$sql = "SELECT DISTINCT(b.num_releve) as num";
$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
$sql .= " WHERE b.num_releve < '".$db->escape($numref)."'";
- $sql .= " AND b.fk_account = ".$id;
+ $sql .= " AND b.fk_account = ".((int) $id);
$sql .= " ORDER BY b.num_releve DESC";
dol_syslog("htdocs/compta/bank/releve.php", LOG_DEBUG);
@@ -97,12 +97,12 @@ if ($_GET["rel"] == 'prev') {
$found = true;
}
}
-} elseif ($_GET["rel"] == 'next') {
+} elseif (GETPOST("rel") == 'next') {
// Recherche valeur pour num = numero releve precedent
$sql = "SELECT DISTINCT(b.num_releve) as num";
$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
$sql .= " WHERE b.num_releve > '".$db->escape($numref)."'";
- $sql .= " AND b.fk_account = ".$id;
+ $sql .= " AND b.fk_account = ".((int) $id);
$sql .= " ORDER BY b.num_releve ASC";
dol_syslog("htdocs/compta/bank/releve.php", LOG_DEBUG);
diff --git a/htdocs/compta/bank/annuel.php b/htdocs/compta/bank/annuel.php
index 45ae92480a0..686b14362cc 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -267,7 +267,7 @@ if ($result < 0) {
$sql .= " WHERE b.fk_account = ba.rowid";
$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
if ($id && $_GET["option"] != 'all') {
- $sql .= " AND b.fk_account IN (".$id.")";
+ $sql .= " AND b.fk_account IN (".$db->sanitize($id).")";
}
$resql = $db->query($sql);
@@ -299,7 +299,7 @@ if ($result < 0) {
$sql .= " AND b.datev <= '".($year - $annee)."-12-31 23:59:59'";
$sql .= " AND b.amount > 0";
if ($id && $_GET["option"] != 'all') {
- $sql .= " AND b.fk_account IN (".$id.")";
+ $sql .= " AND b.fk_account IN (".$db->sanitize($id).")";
}
$sql .= " GROUP BY date_format(b.datev,'%m');";
@@ -381,7 +381,7 @@ if ($result < 0) {
$sql .= " AND b.datev <= '".($year - $annee)."-12-31 23:59:59'";
$sql .= " AND b.amount < 0";
if ($id && $_GET["option"] != 'all') {
- $sql .= " AND b.fk_account IN (".$id.")";
+ $sql .= " AND b.fk_account IN (".$db->sanitize($id).")";
}
$sql .= " GROUP BY date_format(b.datev,'%m');";
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 37ef8a5da76..f07b38045f2 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -581,7 +581,7 @@ if (is_array($extrafields->attributes[$object->table_element]['label']) && count
$sql .= " WHERE b.fk_account = ba.rowid";
$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
if ($search_account > 0) {
- $sql .= " AND b.fk_account = ".$search_account;
+ $sql .= " AND b.fk_account = ".((int) $search_account);
}
// Search period criteria
if (dol_strlen($search_dt_start) > 0) {
@@ -607,7 +607,7 @@ if ($search_num_releve) {
$sql .= natural_search("b.num_releve", $search_num_releve);
}
if ($search_conciliated != '' && $search_conciliated != '-1') {
- $sql .= " AND b.rappro = ".urlencode($search_conciliated);
+ $sql .= " AND b.rappro = ".((int) $search_conciliated);
}
if ($search_thirdparty_user) {
$sql.= " AND (b.rowid IN ";
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index ccc834835a4..bf74035d553 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -305,8 +305,10 @@ if (!empty($conf->accounting->enabled)) {
$countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
$title = $langs->trans("FinancialAccount")." - ".$langs->trans("Card");
-$helpurl = "EN:Module_Banks_and_Cash";
-llxHeader("", $title, $helpurl);
+
+$help_url = "EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses";
+
+llxHeader("", $title, $help_url);
// Creation
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index be38f1311d7..451f855a5fe 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -943,7 +943,7 @@ class Account extends CommonObject
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'accounting_journal as aj ON aj.rowid=ba.fk_accountancy_journal';
$sql .= " WHERE ba.entity IN (".getEntity($this->element).")";
if ($id) {
- $sql .= " AND ba.rowid = ".$id;
+ $sql .= " AND ba.rowid = ".((int) $id);
}
if ($ref) {
$sql .= " AND ba.ref = '".$this->db->escape($ref)."'";
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index 35102281ae9..6f0ffed4153 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -92,8 +92,10 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
*/
$title = $langs->trans("FinancialAccount").' - '.$langs->trans("Documents");
-$helpurl = "";
-llxHeader('', $title, $helpurl);
+
+$help_url = "EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses";
+
+llxHeader("", $title, $help_url);
$form = new Form($db);
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 6dd588f51e1..4c0efec57d2 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -35,10 +35,10 @@ $WIDTH = DolGraph::getDefaultGraphSizeForStats('width', 768);
$HEIGHT = DolGraph::getDefaultGraphSizeForStats('height', 200);
// Security check
-if (isset($_GET["account"]) || isset($_GET["ref"])) {
- $id = isset($_GET["account"]) ? $_GET["account"] : (isset($_GET["ref"]) ? $_GET["ref"] : '');
+if (GETPOST('account') || GETPOST('ref')) {
+ $id = GETPOST('account') ? GETPOST('account') : GETPOST('ref');
}
-$fieldid = isset($_GET["ref"]) ? 'ref' : 'rowid';
+$fieldid = GETPOST('ref') ? 'ref' : 'rowid';
if ($user->socid) {
$socid = $user->socid;
}
@@ -66,19 +66,19 @@ $datetime = dol_now();
$year = dol_print_date($datetime, "%Y");
$month = dol_print_date($datetime, "%m");
$day = dol_print_date($datetime, "%d");
-if (GETPOST("year")) {
- $year = sprintf("%04d", GETPOST("year"));
+if (GETPOST("year", 'int')) {
+ $year = sprintf("%04d", GETPOST("year", 'int'));
}
-if (GETPOST("month")) {
- $month = sprintf("%02d", GETPOST("month"));
+if (GETPOST("month", 'int')) {
+ $month = sprintf("%02d", GETPOST("month", 'int'));
}
$object = new Account($db);
-if ($_GET["account"] && !preg_match('/,/', $_GET["account"])) { // if for a particular account and not a list
- $result = $object->fetch(GETPOST("account", "int"));
+if (GETPOST('account') && !preg_match('/,/', GETPOST('account'))) { // if for a particular account and not a list
+ $result = $object->fetch(GETPOST('account', 'int'));
}
-if ($_GET["ref"]) {
+if (GETPOST("ref")) {
$result = $object->fetch(0, GETPOST("ref"));
$account = $object->id;
}
@@ -96,7 +96,7 @@ if ($result < 0) {
$sql .= " WHERE b.fk_account = ba.rowid";
$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
if ($account && $_GET["option"] != 'all') {
- $sql .= " AND b.fk_account IN (".$account.")";
+ $sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
}
$resql = $db->query($sql);
@@ -138,7 +138,7 @@ if ($result < 0) {
$sql .= " AND b.datev >= '".$db->escape($year)."-".$db->escape($month)."-01 00:00:00'";
$sql .= " AND b.datev < '".$db->escape($yearnext)."-".$db->escape($monthnext)."-01 00:00:00'";
if ($account && $_GET["option"] != 'all') {
- $sql .= " AND b.fk_account IN (".$account.")";
+ $sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
}
$sql .= " GROUP BY date_format(b.datev,'%Y%m%d')";
@@ -166,7 +166,7 @@ if ($result < 0) {
$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
$sql .= " AND b.datev < '".$db->escape($year)."-".sprintf("%02s", $month)."-01'";
if ($account && $_GET["option"] != 'all') {
- $sql .= " AND b.fk_account IN (".$account.")";
+ $sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
}
$resql = $db->query($sql);
@@ -280,7 +280,7 @@ if ($result < 0) {
$sql .= " AND b.datev >= '".$db->escape($year)."-01-01 00:00:00'";
$sql .= " AND b.datev <= '".$db->escape($year)."-12-31 23:59:59'";
if ($account && $_GET["option"] != 'all') {
- $sql .= " AND b.fk_account IN (".$account.")";
+ $sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
}
$sql .= " GROUP BY date_format(b.datev,'%Y%m%d')";
@@ -308,7 +308,7 @@ if ($result < 0) {
$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
$sql .= " AND b.datev < '".$db->escape($year)."-01-01'";
if ($account && $_GET["option"] != 'all') {
- $sql .= " AND b.fk_account IN (".$account.")";
+ $sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
}
$resql = $db->query($sql);
@@ -416,7 +416,7 @@ if ($result < 0) {
$sql .= " WHERE b.fk_account = ba.rowid";
$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
if ($account && $_GET["option"] != 'all') {
- $sql .= " AND b.fk_account IN (".$account.")";
+ $sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
}
$sql .= " GROUP BY date_format(b.datev,'%Y%m%d')";
@@ -541,7 +541,7 @@ if ($result < 0) {
$sql .= " AND b.datev < '".$db->escape($yearnext)."-".$db->escape($monthnext)."-01 00:00:00'";
$sql .= " AND b.amount > 0";
if ($account && $_GET["option"] != 'all') {
- $sql .= " AND b.fk_account IN (".$account.")";
+ $sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
}
$sql .= " GROUP BY date_format(b.datev,'%d')";
@@ -576,7 +576,7 @@ if ($result < 0) {
$sql .= " AND b.datev < '".$db->escape($yearnext)."-".$db->escape($monthnext)."-01 00:00:00'";
$sql .= " AND b.amount < 0";
if ($account && $_GET["option"] != 'all') {
- $sql .= " AND b.fk_account IN (".$account.")";
+ $sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
}
$sql .= " GROUP BY date_format(b.datev,'%d')";
@@ -650,7 +650,7 @@ if ($result < 0) {
$sql .= " AND b.datev <= '".$db->escape($year)."-12-31 23:59:59'";
$sql .= " AND b.amount > 0";
if ($account && $_GET["option"] != 'all') {
- $sql .= " AND b.fk_account IN (".$account.")";
+ $sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
}
$sql .= " GROUP BY date_format(b.datev,'%m');";
@@ -677,7 +677,7 @@ if ($result < 0) {
$sql .= " AND b.datev <= '".$db->escape($year)."-12-31 23:59:59'";
$sql .= " AND b.amount < 0";
if ($account && $_GET["option"] != 'all') {
- $sql .= " AND b.fk_account IN (".$account.")";
+ $sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
}
$sql .= " GROUP BY date_format(b.datev,'%m')";
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index 39cbb91fde1..65542598351 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -264,10 +264,6 @@ if ($search_accountancy_subledger > 0) {
if ($typeid > 0) {
$sql .= " AND v.fk_typepayment=".$typeid;
}
-if ($filtre) {
- $filtre = str_replace(":", "=", $filtre);
- $sql .= " AND ".$filtre;
-}
if ($search_all) {
$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
}
diff --git a/htdocs/compta/deplacement/class/deplacementstats.class.php b/htdocs/compta/deplacement/class/deplacementstats.class.php
index bb99b477584..64cee98c33b 100644
--- a/htdocs/compta/deplacement/class/deplacementstats.class.php
+++ b/htdocs/compta/deplacement/class/deplacementstats.class.php
@@ -64,13 +64,13 @@ class DeplacementStats extends Stats
$this->where = " fk_statut > 0";
$this->where .= " AND entity = ".$conf->entity;
- if ($this->socid) {
- $this->where .= " AND fk_soc = ".$this->socid;
+ if ($this->socid > 0) {
+ $this->where .= " AND fk_soc = ".((int) $this->socid);
}
if (is_array($this->userid) && count($this->userid) > 0) {
- $this->where .= ' AND fk_user IN ('.join(',', $this->userid).')';
+ $this->where .= ' AND fk_user IN ('.$this->db->sanitize(join(',', $this->userid)).')';
} elseif ($this->userid > 0) {
- $this->where .= ' AND fk_user = '.$this->userid;
+ $this->where .= ' AND fk_user = '.((int) $this->userid);
}
}
diff --git a/htdocs/compta/deplacement/index.php b/htdocs/compta/deplacement/index.php
index 780835b0c5e..547f0676b7b 100644
--- a/htdocs/compta/deplacement/index.php
+++ b/htdocs/compta/deplacement/index.php
@@ -76,7 +76,7 @@ $sql = "SELECT count(d.rowid) as nb, sum(d.km) as km, d.type";
$sql .= " FROM ".MAIN_DB_PREFIX."deplacement as d";
$sql .= " WHERE d.entity = ".$conf->entity;
if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) {
- $sql .= ' AND d.fk_user IN ('.join(',', $childids).')';
+ $sql .= ' AND d.fk_user IN ('.$db->sanitize(join(',', $childids)).')';
}
$sql .= " GROUP BY d.type";
$sql .= " ORDER BY d.type";
@@ -156,13 +156,13 @@ if (!$user->rights->societe->client->voir && !$user->socid) {
$sql .= " WHERE u.rowid = d.fk_user";
$sql .= " AND d.entity = ".$conf->entity;
if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) {
- $sql .= ' AND d.fk_user IN ('.join(',', $childids).')';
+ $sql .= ' AND d.fk_user IN ('.$db->sanitize(join(',', $childids)).')';
}
if (!$user->rights->societe->client->voir && !$user->socid) {
$sql .= " AND d.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
}
if ($socid) {
- $sql .= " AND d.fk_soc = ".$socid;
+ $sql .= " AND d.fk_soc = ".((int) $socid);
}
$sql .= $db->order("d.tms", "DESC");
$sql .= $db->plimit($max, 0);
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index 46d17c30e96..61d30ea1345 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -102,17 +102,17 @@ if (!$user->rights->societe->client->voir && !$socid) {
$sql .= " WHERE d.fk_user = u.rowid";
$sql .= " AND d.entity = ".$conf->entity;
if (empty($user->rights->deplacement->readall) && empty($user->rights->deplacement->lire_tous)) {
- $sql .= ' AND d.fk_user IN ('.join(',', $childids).')';
+ $sql .= ' AND d.fk_user IN ('.$db->sanitize(join(',', $childids)).')';
}
if (!$user->rights->societe->client->voir && !$socid) {
$sql .= " AND (sc.fk_user = ".$user->id." OR d.fk_soc IS NULL) ";
}
if ($socid) {
- $sql .= " AND s.rowid = ".$socid;
+ $sql .= " AND s.rowid = ".((int) $socid);
}
if ($search_ref) {
- $sql .= " AND d.rowid=".$search_ref;
+ $sql .= " AND d.rowid = ".((int) $search_ref);
}
if ($search_name) {
$sql .= natural_search('u.lastname', $search_name);
diff --git a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
index 82520c02fac..05aa47737be 100644
--- a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
@@ -91,7 +91,7 @@ if ($action != 'create' && $action != 'edit') {
/*
*
- * Creation d'un champ optionnel
+ * Creation of an optional field
*
*/
@@ -104,7 +104,7 @@ if ($action == 'create') {
/*
*
- * Edition d'un champ optionnel
+ * Edition of an optional field
*
*/
if ($action == 'edit' && !empty($attrname)) {
diff --git a/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
index 5264ee5472c..6ebdfae6277 100644
--- a/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
@@ -91,7 +91,7 @@ if ($action != 'create' && $action != 'edit') {
/*
*
- * Creation d'un champ optionnel
+ * Creation of an optional field
*
*/
@@ -104,7 +104,7 @@ if ($action == 'create') {
/*
*
- * Edition d'un champ optionnel
+ * Edition of an optional field
*
*/
if ($action == 'edit' && !empty($attrname)) {
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index cd1905f528f..fd8a9c1045d 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -2571,7 +2571,7 @@ if (empty($reshook)) {
$sql .= ' SET situation_cycle_ref='.$newCycle;
$sql .= ' , situation_final=0';
$sql .= ' , situation_counter='.$object->situation_counter;
- $sql .= ' WHERE rowid IN ('.implode(',', $linkedCreditNotesList).')';
+ $sql .= ' WHERE rowid IN ('.$db->sanitize(implode(',', $linkedCreditNotesList)).')';
$resql = $db->query($sql);
if (!$resql) {
@@ -2815,9 +2815,10 @@ if (!empty($conf->projet->enabled)) {
$now = dol_now();
$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Card');
-$helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
-llxHeader('', $title, $helpurl);
+$help_url = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
+
+llxHeader('', $title, $help_url);
// Mode creation
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index c16d79d2574..9c224b057ab 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -1,6 +1,6 @@
-/* Copyright (C) 2020 Thibault FOUCART
+ * Copyright (C) 2020 Thibault FOUCART
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -191,7 +191,7 @@ class Invoices extends DolibarrApi
$sql .= " AND t.fk_soc = sc.fk_soc";
}
if ($socids) {
- $sql .= " AND t.fk_soc IN (".$socids.")";
+ $sql .= " AND t.fk_soc IN (".$this->db->sanitize($socids).")";
}
if ($search_sale > 0) {
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index b0690675b53..1afa9347f67 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -2248,7 +2248,7 @@ class Facture extends CommonInvoice
if (count($list_rowid_det)) {
$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe_remise_except';
$sql .= ' SET fk_facture = NULL, fk_facture_line = NULL';
- $sql .= ' WHERE fk_facture_line IN ('.join(',', $list_rowid_det).')';
+ $sql .= ' WHERE fk_facture_line IN ('.$this->db->sanitize(join(',', $list_rowid_det)).')';
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
if (!$this->db->query($sql)) {
@@ -4033,7 +4033,7 @@ class Facture extends CommonInvoice
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
}
if ($socid) {
- $sql .= " AND s.rowid = ".$socid;
+ $sql .= " AND s.rowid = ".((int) $socid);
}
if ($draft) {
$sql .= " AND f.fk_statut = ".self::STATUS_DRAFT;
@@ -4158,13 +4158,13 @@ class Facture extends CommonInvoice
$sqlSit .= " AND fs.fk_statut in (".self::STATUS_VALIDATED.",".self::STATUS_CLOSED.")";
$sqlSit .= " GROUP BY fs.situation_cycle_ref";
$sqlSit .= " ORDER BY fs.situation_counter";
- $sql .= " AND ( f.type != ".self::TYPE_SITUATION." OR f.rowid IN (".$sqlSit.") )"; // Type non 5 si facture non avoir
+ $sql .= " AND ( f.type != ".self::TYPE_SITUATION." OR f.rowid IN (".$this->db->sanitize($sqlSit).") )"; // Type non 5 si facture non avoir
} else {
$sql .= " AND f.type != ".self::TYPE_SITUATION; // Type non 5 si facture non avoir
}
if ($socid > 0) {
- $sql .= " AND f.fk_soc = ".$socid;
+ $sql .= " AND f.fk_soc = ".((int) $socid);
}
$sql .= " ORDER BY f.ref";
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 4c0544e3810..f4937679504 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -91,8 +91,10 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
*/
$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Documents');
-$helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
-llxHeader('', $title, $helpurl);
+
+$help_url = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
+
+llxHeader('', $title, $help_url);
$form = new Form($db);
diff --git a/htdocs/compta/facture/index.php b/htdocs/compta/facture/index.php
index 4939fbb6a95..a4d6dd6fec7 100644
--- a/htdocs/compta/facture/index.php
+++ b/htdocs/compta/facture/index.php
@@ -232,7 +232,7 @@ function getDraftTable($maxCount = 500, $socid = 0)
$sql .= " AND f.entity IN (".getEntity('facture').")";
$sql .= " AND f.fk_statut = ".Facture::STATUS_DRAFT;
if ($socid) {
- $sql .= " AND f.fk_soc = ".$socid;
+ $sql .= " AND f.fk_soc = ".((int) $socid);
}
if (!$user->rights->societe->client->voir && !$socid) {
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -329,7 +329,7 @@ function getLatestEditTable($maxCount = 5, $socid = 0)
$sql .= " WHERE f.fk_soc = s.rowid";
$sql .= " AND f.entity IN (".getEntity('facture').")";
if ($socid) {
- $sql .= " AND f.fk_soc = ".$socid;
+ $sql .= " AND f.fk_soc = ".((int) $socid);
}
if (!$user->rights->societe->client->voir && !$socid) {
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
@@ -432,7 +432,7 @@ function getOpenTable($maxCount = 500, $socid = 0)
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
}
if ($socid) {
- $sql .= " AND s.rowid = ".$socid;
+ $sql .= " AND s.rowid = ".((int) $socid);
}
$sql .= " ORDER BY f.rowid DESC";
$sql .= $db->plimit($maxCount, 0);
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 31365b33b58..6cf770cb79c 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -513,14 +513,7 @@ if ($userid) {
if ($userid == -1) {
$sql .= ' AND f.fk_user_author IS NULL';
} else {
- $sql .= ' AND f.fk_user_author = '.$userid;
- }
-}
-if ($filtre) {
- $aFilter = explode(',', $filtre);
- foreach ($aFilter as $filter) {
- $filt = explode(':', $filter);
- $sql .= ' AND '.$db->escape(trim($filt[0])).' = '.$db->escape(trim($filt[1]));
+ $sql .= ' AND f.fk_user_author = '.((int) $userid);
}
}
if ($search_ref) {
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 2818fa5f3b9..96c414db350 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -103,16 +103,16 @@ dol_mkdir($dir);
$stats = new FactureStats($db, $socid, $mode, ($userid > 0 ? $userid : 0), ($typent_id > 0 ? $typent_id : 0), ($categ_id > 0 ? $categ_id : 0));
if ($mode == 'customer') {
if ($object_status != '' && $object_status >= 0) {
- $stats->where .= ' AND f.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
+ $stats->where .= ' AND f.fk_statut IN ('.$db->sanitize($object_status).')';
}
if (is_array($custcats) && !empty($custcats)) {
$stats->from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cat ON (f.fk_soc = cat.fk_soc)';
- $stats->where .= ' AND cat.fk_categorie IN ('.implode(',', $custcats).')';
+ $stats->where .= ' AND cat.fk_categorie IN ('.$db->sanitize(implode(',', $custcats)).')';
}
}
if ($mode == 'supplier') {
if ($object_status != '' && $object_status >= 0) {
- $stats->where .= ' AND f.fk_statut IN ('.$db->sanitize($db->escape($object_status)).')';
+ $stats->where .= ' AND f.fk_statut IN ('.$db->sanitize($object_status).')';
}
}
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index a4c19f4d039..9c3544b512e 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -1208,8 +1208,6 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
print '';
print $langs->trans("BillsSuppliersUnpaid", $num).' ';
print '';
- // TODO: "impayees.php" looks very outdatetd and should be set to deprecated or directly remove in the next version
- //
print ''.$num.' ';
print ' ';
print ' ';
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 42b05f39263..9dcc57a47f2 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -171,9 +171,9 @@ class Paiement extends CommonObject
if ($id > 0) {
$sql .= ' AND p.rowid = '.((int) $id);
} elseif ($ref) {
- $sql .= " AND p.ref = '".$ref."'";
+ $sql .= " AND p.ref = '".$this->db->escape($ref)."'";
} elseif ($fk_bank) {
- $sql .= ' AND p.fk_bank = '.$fk_bank;
+ $sql .= ' AND p.fk_bank = '.((int) $fk_bank);
}
$resql = $this->db->query($sql);
@@ -1127,9 +1127,10 @@ class Paiement extends CommonObject
* @param string $option Sur quoi pointe le lien
* @param string $mode 'withlistofinvoices'=Include list of invoices into tooltip
* @param int $notooltip 1=Disable tooltip
+ * @param string $morecss Add more CSS
* @return string Chaine avec URL
*/
- public function getNomUrl($withpicto = 0, $option = '', $mode = 'withlistofinvoices', $notooltip = 0)
+ public function getNomUrl($withpicto = 0, $option = '', $mode = 'withlistofinvoices', $notooltip = 0, $morecss = '')
{
global $conf, $langs;
@@ -1166,7 +1167,7 @@ class Paiement extends CommonObject
$linkclose = '';
if (empty($notooltip)) {
if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
- $label = $langs->trans("ShowMyObject");
+ $label = $langs->trans("Payment");
$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
}
$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 269acd29600..75c63620b0b 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -200,13 +200,13 @@ if (GETPOST("orphelins", "alpha")) {
$sql .= " AND sc.fk_user = ".$user->id;
}
if ($socid > 0) {
- $sql .= " AND f.fk_soc = ".$socid;
+ $sql .= " AND f.fk_soc = ".((int) $socid);
}
if ($userid) {
if ($userid == -1) {
$sql .= " AND f.fk_user_author IS NULL";
} else {
- $sql .= " AND f.fk_user_author = ".$userid;
+ $sql .= " AND f.fk_user_author = ".((int) $userid);
}
}
@@ -216,7 +216,7 @@ if (GETPOST("orphelins", "alpha")) {
$sql .= natural_search('p.ref', $search_ref);
}
if ($search_account > 0) {
- $sql .= " AND b.fk_account=".$search_account;
+ $sql .= " AND b.fk_account=".((int) $search_account);
}
if ($search_paymenttype != '') {
$sql .= " AND c.code='".$db->escape($search_paymenttype)."'";
diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
index 92bc7ec6ff8..a705353112c 100644
--- a/htdocs/compta/paymentbybanktransfer/index.php
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -115,7 +115,7 @@ if (!$user->rights->societe->client->voir && !$socid) {
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
}
if ($socid) {
- $sql .= " AND f.fk_soc = ".$socid;
+ $sql .= " AND f.fk_soc = ".((int) $socid);
}
$resql = $db->query($sql);
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 24ea982f01b..d04e7131edc 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -351,12 +351,12 @@ if ($id > 0 || $ref) {
$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
$sql .= ", ".MAIN_DB_PREFIX."prelevement_bons as pb";
$sql .= ", ".MAIN_DB_PREFIX."societe as s";
- $sql .= " WHERE pl.fk_prelevement_bons = ".$id;
+ $sql .= " WHERE pl.fk_prelevement_bons = ".((int) $id);
$sql .= " AND pl.fk_prelevement_bons = pb.rowid";
$sql .= " AND pb.entity = ".$conf->entity;
$sql .= " AND pl.fk_soc = s.rowid";
if ($socid) {
- $sql .= " AND s.rowid = ".$socid;
+ $sql .= " AND s.rowid = ".((int) $socid);
}
$sql .= $db->order($sortfield, $sortorder);
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index deb5fe2fcd5..e12c50b75f5 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -319,7 +319,7 @@ if ($type == 'bank-transfer') {
$sql .= " AND pfd.fk_facture = f.rowid";
}
if ($socid > 0) {
- $sql .= " AND f.fk_soc = ".$socid;
+ $sql .= " AND f.fk_soc = ".((int) $socid);
}
$nbtotalofrecords = '';
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 9d0fa17d246..266097f7a2d 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -141,14 +141,14 @@ if (!$user->rights->societe->client->voir && !$socid) {
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
}
if ($socid) {
- $sql .= " AND f.fk_soc = ".$socid;
+ $sql .= " AND f.fk_soc = ".((int) $socid);
}
if (!$status) {
$sql .= " AND pfd.traite = 0";
}
$sql .= " AND pfd.ext_payment_id IS NULL";
if ($status) {
- $sql .= " AND pfd.traite = ".$status;
+ $sql .= " AND pfd.traite = ".((int) $status);
}
$sql .= " AND f.total_ttc > 0";
if (empty($conf->global->WITHDRAWAL_ALLOW_ANY_INVOICE_STATUS)) {
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 301a5c7808c..23511a4a00a 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -195,10 +195,10 @@ if ($object->type != 'bank-transfer') {
$sql .= " AND f.entity IN (".getEntity('supplier_invoice').")";
}
if ($object->id > 0) {
- $sql .= " AND p.rowid=".$object->id;
+ $sql .= " AND p.rowid = ".((int) $object->id);
}
if ($socid) {
- $sql .= " AND s.rowid = ".$socid;
+ $sql .= " AND s.rowid = ".((int) $socid);
}
$sql .= $db->order($sortfield, $sortorder);
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index 62c3c4849f8..9a4f209e134 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -177,7 +177,7 @@ $sql .= " AND pl.fk_soc = s.rowid";
$sql .= " AND pl.statut = 3 ";
$sql .= " AND pr.fk_prelevement_lignes = pl.rowid";
if ($socid) {
- $sql .= " AND s.rowid = ".$socid;
+ $sql .= " AND s.rowid = ".((int) $socid);
}
$sql .= " ORDER BY pl.amount DESC";
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 2da8e1f0812..6e537159721 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -115,7 +115,7 @@ if (!$user->rights->societe->client->voir && !$socid) {
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
}
if ($socid) {
- $sql .= " AND f.fk_soc = ".$socid;
+ $sql .= " AND f.fk_soc = ".((int) $socid);
}
$resql = $db->query($sql);
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index 68ca3795fe3..73c985355b1 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -262,9 +262,9 @@ if ($id) {
$sql .= " AND f.fk_soc = s.rowid";
$sql .= " AND pf.fk_facture = f.rowid";
$sql .= " AND f.entity IN (".getEntity('invoice').")";
- $sql .= " AND pl.rowid=".$id;
+ $sql .= " AND pl.rowid = ".((int) $id);
if ($socid) {
- $sql .= " AND s.rowid = ".$socid;
+ $sql .= " AND s.rowid = ".((int) $socid);
}
$sql .= " ORDER BY $sortfield $sortorder ";
$sql .= $db->plimit($conf->liste_limit + 1, $offset);
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index e5b86ba762e..272d6808b32 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -347,7 +347,7 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
$sql .= " AND f.entity = ".$conf->entity;
if ($socid) {
- $sql .= " AND f.fk_soc = ".$socid;
+ $sql .= " AND f.fk_soc = ".((int) $socid);
}
$sql .= " GROUP BY dm";
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 91932100565..8ef75bf5846 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -281,7 +281,7 @@ if ($modecompta == 'CREANCES-DETTES') {
if (! empty($date_start) && ! empty($date_end))
$sql.= " AND t.doc_date >= '".$db->idate($date_start)."' AND t.doc_date <= '".$db->idate($date_end)."'";
if (! empty($month)) {
- $sql .= " AND MONTH(t.doc_date) = " . $month;
+ $sql .= " AND MONTH(t.doc_date) = " . ((int) $month);
}
$resql = $db->query($sql);
if ($resql)
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 067c021fe75..83a6a8f3b3a 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -445,12 +445,24 @@ if ($id > 0) {
// Employee
if ($action != 'editfk_user') {
- $morehtmlref .= ' ';
print "
\n";
- dol_fiche_head();
+ print dol_get_fiche_head();
print '
';
- dol_fiche_end();
+ print dol_get_fiche_end();
print '
';
+ print '
';
+ print ''.$langs->trans("ClosePaidVATAutomatically").' ';
+ print ' ';
print '
';
print ' ';
print '
';
@@ -512,7 +510,7 @@ if ($id) {
print '
';
}
- dol_fiche_head($head, 'card', $langs->trans("VATPayment"), -1, 'payment');
+ print dol_get_fiche_head($head, 'card', $langs->trans("VATPayment"), -1, 'payment');
$morehtmlref = '
';
// Label of social contribution
@@ -710,7 +708,7 @@ if ($id) {
print '
';
- dol_fiche_end();
+ print dol_get_fiche_end();
if ($action == 'edit') {
print '
';
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index 7ec5ad5b4f1..5b990258672 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -43,71 +43,7 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.
// Load translation files required by the page
$langs->loadLangs(array("other", "compta", "banks", "bills", "companies", "product", "trips", "admin"));
-
-$now = dol_now();
-$current_date = dol_getdate($now);
-if (empty($conf->global->SOCIETE_FISCAL_MONTH_START)) {
- $conf->global->SOCIETE_FISCAL_MONTH_START = 1;
-}
-
-// Date range
-$year = GETPOST("year", "int");
-if (empty($year)) {
- $year_current = $current_date['year'];
- $year_start = $year_current;
-} else {
- $year_current = $year;
- $year_start = $year;
-}
-$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
-$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
-// Set default period if not defined
-if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
- $q = GETPOST("q", "int");
- if (empty($q)) {
- if (GETPOST("month", 'int')) {
- $date_start = dol_get_first_day($year_start, GETPOST("month", 'int'), false);
- $date_end = dol_get_last_day($year_start, GETPOST("month", 'int'), false);
- } else {
- if (empty($conf->global->MAIN_INFO_VAT_RETURN) || $conf->global->MAIN_INFO_VAT_RETURN == 2) { // quaterly vat, we take last past complete quarter
- $date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -3 - (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) % 3), 'm');
- $date_end = dol_time_plus_duree($date_start, 3, 'm') - 1;
- } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) { // yearly vat
- if ($current_date['mon'] < $conf->global->SOCIETE_FISCAL_MONTH_START) {
- if (($conf->global->SOCIETE_FISCAL_MONTH_START - $current_date['mon']) > 6) { // If period started from less than 6 years, we show past year
- $year_start--;
- }
- } else {
- if (($current_date['mon'] - $conf->global->SOCIETE_FISCAL_MONTH_START) < 6) { // If perdio started from less than 6 years, we show past year
- $year_start--;
- }
- }
- $date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
- $date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
- } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 1) { // monthly vat, we take last past complete month
- $date_start = dol_time_plus_duree(dol_get_first_day($year_start, $current_date['mon'], false), -1, 'm');
- $date_end = dol_time_plus_duree($date_start, 1, 'm') - 1;
- }
- }
- } else {
- if ($q == 1) {
- $date_start = dol_get_first_day($year_start, 1, false);
- $date_end = dol_get_last_day($year_start, 3, false);
- }
- if ($q == 2) {
- $date_start = dol_get_first_day($year_start, 4, false);
- $date_end = dol_get_last_day($year_start, 6, false);
- }
- if ($q == 3) {
- $date_start = dol_get_first_day($year_start, 7, false);
- $date_end = dol_get_last_day($year_start, 9, false);
- }
- if ($q == 4) {
- $date_start = dol_get_first_day($year_start, 10, false);
- $date_end = dol_get_last_day($year_start, 12, false);
- }
- }
-}
+include DOL_DOCUMENT_ROOT.'/compta/tva/initdatesforvat.inc.php';
$min = price2num(GETPOST("min", "alpha"));
if (empty($min)) {
@@ -116,16 +52,16 @@ if (empty($min)) {
// Define modetax (0 or 1)
// 0=normal, 1=option vat for services is on debit, 2=option on payments for products
-$modetax = $conf->global->TAX_MODE;
+$modetax = (empty($conf->global->TAX_MODE) ? 0 : $conf->global->TAX_MODE);
if (GETPOSTISSET("modetax")) {
- $modetax = GETPOST("modetax", 'int');
+ $modetax = GETPOSTINT("modetax");
}
if (empty($modetax)) {
$modetax = 0;
}
// Security check
-$socid = GETPOST('socid', 'int');
+$socid = GETPOSTINT('socid');
if ($user->socid) {
$socid = $user->socid;
}
@@ -184,7 +120,7 @@ if ($modetax == 2) {
$calcmode .= '
('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').') ';
// Set period
$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
-$prevyear = $year_start;
+$prevyear = $date_start_year;
$prevquarter = $q;
if ($prevquarter > 1) {
$prevquarter--;
@@ -192,7 +128,7 @@ if ($prevquarter > 1) {
$prevquarter = 4;
$prevyear--;
}
-$nextyear = $year_start;
+$nextyear = $date_start_year;
$nextquarter = $q;
if ($nextquarter < 4) {
$nextquarter++;
@@ -262,6 +198,10 @@ $y = $year_current;
$total = 0;
$i = 0;
$columns = 5;
+$span = $columns;
+if ($modetax != 1) {
+ $span += 2;
+}
// Load arrays of datas
$x_coll = tax_by_thirdparty('vat', $db, 0, $date_start, $date_end, $modetax, 'sell');
@@ -290,14 +230,33 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
$invoice_customer->id = $x_coll[$my_coll_thirdpartyid]['facid'][$id];
$invoice_customer->ref = $x_coll[$my_coll_thirdpartyid]['facnum'][$id];
$invoice_customer->type = $x_coll[$my_coll_thirdpartyid]['type'][$id];
- $company_static->fetch($x_coll[$my_coll_thirdpartyid]['company_id'][$id]);
+
+ //$company_static->fetch($x_coll[$my_coll_thirdpartyid]['company_id'][$id]);
+ $company_static->id = $x_coll[$my_coll_thirdpartyid]['company_id'][$id];
+ $company_static->name = $x_coll[$my_coll_thirdpartyid]['company_name'][$id];
+ $company_static->name_alias = $x_coll[$my_coll_thirdpartyid]['company_alias'][$id];
+ $company_static->email = $x_coll[$my_coll_thirdpartyid]['company_email'][$id];
+ $company_static->tva_intra = $x_coll[$my_coll_thirdpartyid]['tva_intra'][$id];
+ $company_static->client = $x_coll[$my_coll_thirdpartyid]['company_client'][$id];
+ $company_static->fournisseur = $x_coll[$my_coll_thirdpartyid]['company_fournisseur'][$id];
+ $company_static->status = $x_coll[$my_coll_thirdpartyid]['company_status'][$id];
+ $company_static->code_client = $x_coll[$my_coll_thirdpartyid]['company_customer_code'][$id];
+ $company_static->code_compta_client = $x_coll[$my_coll_thirdpartyid]['company_customer_accounting_code'][$id];
+ $company_static->code_fournisseur = $x_coll[$my_coll_thirdpartyid]['company_supplier_code'][$id];
+ $company_static->code_compta_fournisseur = $x_coll[$my_coll_thirdpartyid]['company_supplier_accounting_code'][$id];
+
$x_both[$my_coll_thirdpartyid]['coll']['detail'][] = array(
'id' =>$x_coll[$my_coll_thirdpartyid]['facid'][$id],
'descr' =>$x_coll[$my_coll_thirdpartyid]['descr'][$id],
+
'pid' =>$x_coll[$my_coll_thirdpartyid]['pid'][$id],
'pref' =>$x_coll[$my_coll_thirdpartyid]['pref'][$id],
'ptype' =>$x_coll[$my_coll_thirdpartyid]['ptype'][$id],
+ 'pstatus' =>$x_paye[$my_coll_thirdpartyid]['pstatus'][$id],
+ 'pstatusbuy'=>$x_paye[$my_coll_thirdpartyid]['pstatusbuy'][$id],
+
'payment_id'=>$x_coll[$my_coll_thirdpartyid]['payment_id'][$id],
+ 'payment_ref'=>$x_coll[$my_coll_thirdpartyid]['payment_ref'][$id],
'payment_amount'=>$x_coll[$my_coll_thirdpartyid]['payment_amount'][$id],
'ftotal_ttc'=>$x_coll[$my_coll_thirdpartyid]['ftotal_ttc'][$id],
'dtotal_ttc'=>$x_coll[$my_coll_thirdpartyid]['dtotal_ttc'][$id],
@@ -305,7 +264,9 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
'drate' =>$x_coll[$my_coll_thirdpartyid]['drate'][$id],
'datef' =>$x_coll[$my_coll_thirdpartyid]['datef'][$id],
'datep' =>$x_coll[$my_coll_thirdpartyid]['datep'][$id],
+
'company_link'=>$company_static->getNomUrl(1, '', 20),
+
'ddate_start'=>$x_coll[$my_coll_thirdpartyid]['ddate_start'][$id],
'ddate_end' =>$x_coll[$my_coll_thirdpartyid]['ddate_end'][$id],
'totalht' =>$x_coll[$my_coll_thirdpartyid]['totalht_list'][$id],
@@ -335,10 +296,15 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
$x_both[$my_paye_thirdpartyid]['paye']['detail'][] = array(
'id' =>$x_paye[$my_paye_thirdpartyid]['facid'][$id],
'descr' =>$x_paye[$my_paye_thirdpartyid]['descr'][$id],
+
'pid' =>$x_paye[$my_paye_thirdpartyid]['pid'][$id],
'pref' =>$x_paye[$my_paye_thirdpartyid]['pref'][$id],
'ptype' =>$x_paye[$my_paye_thirdpartyid]['ptype'][$id],
+ 'pstatus' =>$x_paye[$my_paye_thirdpartyid]['pstatus'][$id],
+ 'pstatusbuy' =>$x_paye[$my_paye_thirdpartyid]['pstatusbuy'][$id],
+
'payment_id' =>$x_paye[$my_paye_thirdpartyid]['payment_id'][$id],
+ 'payment_ref' =>$x_paye[$my_paye_thirdpartyid]['payment_ref'][$id],
'payment_amount' =>$x_paye[$my_paye_thirdpartyid]['payment_amount'][$id],
'ftotal_ttc' =>price2num($x_paye[$my_paye_thirdpartyid]['ftotal_ttc'][$id]),
'dtotal_ttc' =>price2num($x_paye[$my_paye_thirdpartyid]['dtotal_ttc'][$id]),
@@ -354,14 +320,33 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
$invoice_supplier->id = $x_paye[$my_paye_thirdpartyid]['facid'][$id];
$invoice_supplier->ref = $x_paye[$my_paye_thirdpartyid]['facnum'][$id];
$invoice_supplier->type = $x_paye[$my_paye_thirdpartyid]['type'][$id];
- $company_static->fetch($x_paye[$my_paye_thirdpartyid]['company_id'][$id]);
+
+ //$company_static->fetch($x_paye[$my_paye_thirdpartyid]['company_id'][$id]);
+ $company_static->id = $x_paye[$my_paye_thirdpartyid]['company_id'][$id];
+ $company_static->name = $x_paye[$my_paye_thirdpartyid]['company_name'][$id];
+ $company_static->name_alias = $x_paye[$my_paye_thirdpartyid]['company_alias'][$id];
+ $company_static->email = $x_paye[$my_paye_thirdpartyid]['company_email'][$id];
+ $company_static->tva_intra = $x_paye[$my_paye_thirdpartyid]['tva_intra'][$id];
+ $company_static->client = $x_paye[$my_paye_thirdpartyid]['company_client'][$id];
+ $company_static->fournisseur = $x_paye[$my_paye_thirdpartyid]['company_fournisseur'][$id];
+ $company_static->status = $x_paye[$my_paye_thirdpartyid]['company_status'][$id];
+ $company_static->code_client = $x_paye[$my_paye_thirdpartyid]['company_customer_code'][$id];
+ $company_static->code_compta_client = $x_paye[$my_paye_thirdpartyid]['company_customer_accounting_code'][$id];
+ $company_static->code_fournisseur = $x_paye[$my_paye_thirdpartyid]['company_supplier_code'][$id];
+ $company_static->code_compta_fournisseur = $x_paye[$my_paye_thirdpartyid]['company_supplier_accounting_code'][$id];
+
$x_both[$my_paye_thirdpartyid]['paye']['detail'][] = array(
'id' =>$x_paye[$my_paye_thirdpartyid]['facid'][$id],
'descr' =>$x_paye[$my_paye_thirdpartyid]['descr'][$id],
+
'pid' =>$x_paye[$my_paye_thirdpartyid]['pid'][$id],
'pref' =>$x_paye[$my_paye_thirdpartyid]['pref'][$id],
'ptype' =>$x_paye[$my_paye_thirdpartyid]['ptype'][$id],
+ 'pstatus' =>$x_paye[$my_paye_thirdpartyid]['pstatus'][$id],
+ 'pstatusbuy'=>$x_paye[$my_paye_thirdpartyid]['pstatusbuy'][$id],
+
'payment_id'=>$x_paye[$my_paye_thirdpartyid]['payment_id'][$id],
+ 'payment_ref'=>$x_paye[$my_paye_thirdpartyid]['payment_ref'][$id],
'payment_amount'=>$x_paye[$my_paye_thirdpartyid]['payment_amount'][$id],
'ftotal_ttc'=>price2num($x_paye[$my_paye_thirdpartyid]['ftotal_ttc'][$id]),
'dtotal_ttc'=>price2num($x_paye[$my_paye_thirdpartyid]['dtotal_ttc'][$id]),
@@ -369,7 +354,9 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
'drate' =>$x_paye[$my_coll_thirdpartyid]['drate'][$id],
'datef' =>$x_paye[$my_paye_thirdpartyid]['datef'][$id],
'datep' =>$x_paye[$my_paye_thirdpartyid]['datep'][$id],
+
'company_link'=>$company_static->getNomUrl(1, '', 20),
+
'ddate_start'=>$x_paye[$my_paye_thirdpartyid]['ddate_start'][$id],
'ddate_end' =>$x_paye[$my_paye_thirdpartyid]['ddate_end'][$id],
'totalht' =>price2num($x_paye[$my_paye_thirdpartyid]['totalht_list'][$id]),
@@ -389,11 +376,6 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
$x_paye_sum = 0;
$x_paye_ht = 0;
- $span = $columns;
- if ($modetax != 1) {
- $span += 2;
- }
-
//print '
'..') ';
// Customers invoices
@@ -483,6 +465,9 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
$product_static->id = $fields['pid'];
$product_static->ref = $fields['pref'];
$product_static->type = $fields['dtype']; // We force with the type of line to have type how line is registered
+ $product_static->status = $fields['pstatus'];
+ $product_static->status_buy = $fields['pstatusbuy'];
+
print $product_static->getNomUrl(1);
if (dol_string_nohtmltag($fields['descr'])) {
print ' - '.dol_trunc(dol_string_nohtmltag($fields['descr']), 24);
@@ -528,7 +513,8 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
//print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
$payment_static->id = $fields['payment_id'];
- print $payment_static->getNomUrl(2);
+ $payment_static->ref = $fields['payment_ref'];
+ print $payment_static->getNomUrl(2, '', '', 0).' ';
}
if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
@@ -578,7 +564,7 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
}
}
- if (count($x_coll) == 0) { // Show a total ine if nothing shown
+ if (count($x_coll) == 0) { // Show a total line if nothing shown
print '
';
print ''.$langs->trans("Total").': ';
@@ -662,7 +648,9 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
}
// Company name
- print ''.$fields['company_link'].' ';
+ print '';
+ print $fields['company_link'];
+ print ' ';
// Description
print '';
@@ -714,7 +702,8 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
print ' ';
if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
$paymentfourn_static->id = $fields['payment_id'];
- print $paymentfourn_static->getNomUrl(2);
+ $paymentfourn_static->ref = $fields['payment_ref'];
+ print $paymentfourn_static->getNomUrl(2, '', '', 0);
}
if (($type == 0 && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index ba2669077c9..63b834d7821 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -37,99 +37,15 @@ require_once DOL_DOCUMENT_ROOT.'/compta/localtax/class/localtax.class.php';
// Load translation files required by the page
$langs->loadLangs(array("other", "compta", "banks", "bills", "companies", "product", "trips", "admin"));
-$form = new Form($db);
-$now = dol_now();
-$current_date = dol_getdate($now);
-if (empty($conf->global->SOCIETE_FISCAL_MONTH_START)) {
- $conf->global->SOCIETE_FISCAL_MONTH_START = 1;
-}
-
$refresh = GETPOSTISSET('submit') ? true : false;
+$year_current = GETPOSTISSET('year') ? GETPOST('year', 'int') : dol_print_date($now, '%Y', 'tzserver');
+$year_start = $year_current;
+$month_current = GETPOSTISSET('month') ? GETPOST('month', 'int') : dol_print_date($now, '%m', 'tzserver');
+$month_start = $month_current;
-if ($refresh === false) {
- $year_current = dol_print_date('%Y', $now);
- $month_current = dol_print_date('%m', $now);
+$refresh = true;
- // 1 : Monthly (by default)
- // 2 : Quarterly
- // 3 : Annual
- if ($conf->global->MAIN_INFO_VAT_RETURN == 2) {
- // quarterly
- $year = $year_current;
- if ($month_current >= 7 && $month_current <= 9) {
- $month_start = 4;
- $month_end = 6;
- } elseif ($month_current >= 10 && $month_current <= 12) {
- $month_start = 7;
- $month_end = 9;
- } elseif ($month_current >= 1 && $month_current <= 3) {
- $month_start = 10;
- $month_end = 12;
- $year--;
- } else {
- $month_start = 1;
- $month_end = 3;
- }
- $date_start = dol_get_first_day($year, $month_start);
- $date_end = dol_get_last_day($year, $month_end);
- } elseif ($conf->global->MAIN_INFO_VAT_RETURN == 3) {
- // annual
- $date_start = dol_get_first_day($year_current, 1);
- $date_end = dol_get_last_day($year_current, 12);
- } else {
- // monthly by default
- $year = $year_current;
- $month_last = $month_current - 1;
- if ($month_last <= 0) {
- $month_last = $month_last + 12;
- $year--;
- }
- $date_start = dol_get_first_day($year, $month_last);
- $date_end = dol_get_last_day($year, $month_last);
- }
-} else {
- // Date range
- $year = GETPOST("year", "int");
- if (empty($year)) {
- $year_current = dol_print_date(dol_now(), "%Y");
- if ($conf->global->SOCIETE_FISCAL_MONTH_START > dol_print_date(dol_now(), "%m")) $year_current--;
- $year_start = $year_current;
- } else {
- $year_current = $year;
- $year_start = $year;
- }
- $date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"));
- $date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"));
- if (empty($date_start) || empty($date_end)) {// We define date_start and date_end
- $q = GETPOST("q", "int");
- if (empty($q)) {
- if (GETPOST("month", "int")) {
- $date_start = dol_get_first_day($year_start, GETPOST("month", "int"), false);
- $date_end = dol_get_last_day($year_start, GETPOST("month", "int"), false);
- } else {
- $date_start = dol_get_first_day($year_start, $conf->global->SOCIETE_FISCAL_MONTH_START, false);
- $date_end = dol_time_plus_duree($date_start, 1, 'y') - 1;
- }
- } else {
- if ($q == 1) {
- $date_start = dol_get_first_day($year_start, 1, false);
- $date_end = dol_get_last_day($year_start, 3, false);
- }
- if ($q == 2) {
- $date_start = dol_get_first_day($year_start, 4, false);
- $date_end = dol_get_last_day($year_start, 6, false);
- }
- if ($q == 3) {
- $date_start = dol_get_first_day($year_start, 7, false);
- $date_end = dol_get_last_day($year_start, 9, false);
- }
- if ($q == 4) {
- $date_start = dol_get_first_day($year_start, 10, false);
- $date_end = dol_get_last_day($year_start, 12, false);
- }
- }
- }
-}
+include DOL_DOCUMENT_ROOT.'/compta/tva/initdatesforvat.inc.php';
// Define modetax (0 or 1)
// 0=normal, 1=option vat for services is on debit, 2=option on payments for products
@@ -255,6 +171,7 @@ function pt($db, $sql, $date)
* View
*/
+$form = new Form($db);
$company_static = new Societe($db);
$tva = new Tva($db);
diff --git a/htdocs/compta/tva/initdatesforvat.inc.php b/htdocs/compta/tva/initdatesforvat.inc.php
new file mode 100644
index 00000000000..8039fce728f
--- /dev/null
+++ b/htdocs/compta/tva/initdatesforvat.inc.php
@@ -0,0 +1,98 @@
+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see ('.$langs->trans("TaxModuleSetupToModifyRules", DOL_URL_ROOT.'/admin/taxes.php').') ';
// Set period
-$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0).' - '.$form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0);
-$prevyear = $year_start;
+$period = $form->selectDate($date_start, 'date_start', 0, 0, 0, '', 1, 0, 0, '', '', '', '', 1, '', '', 'tzserver');
+$period .= ' - ';
+$period .= $form->selectDate($date_end, 'date_end', 0, 0, 0, '', 1, 0, 0, '', '', '', '', 1, '', '', 'tzserver');
+$prevyear = $date_start_year;
$prevquarter = $q;
if ($prevquarter > 1) {
$prevquarter--;
@@ -191,7 +135,7 @@ if ($prevquarter > 1) {
$prevquarter = 4;
$prevyear--;
}
-$nextyear = $year_start;
+$nextyear = $date_start_year;
$nextquarter = $q;
if ($nextquarter < 4) {
$nextquarter++;
@@ -256,9 +200,13 @@ print '';
print '
';
$y = $year_current;
-$total = 0;
$i = 0;
-$columns = 5;
+
+$columns = 7;
+$span = $columns;
+if ($modetax != 1) {
+ $span += 2;
+}
// Load arrays of datas
$x_coll = tax_by_rate('vat', $db, 0, 0, $date_start, $date_end, $modetax, 'sell');
@@ -287,7 +235,21 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
$invoice_customer->id = $x_coll[$my_coll_rate]['facid'][$id];
$invoice_customer->ref = $x_coll[$my_coll_rate]['facnum'][$id];
$invoice_customer->type = $x_coll[$my_coll_rate]['type'][$id];
- $company_static->fetch($x_coll[$my_coll_rate]['company_id'][$id]);
+
+ //$company_static->fetch($x_coll[$my_coll_rate]['company_id'][$id]);
+ $company_static->id = $x_coll[$my_coll_rate]['company_id'][$id];
+ $company_static->name = $x_coll[$my_coll_rate]['company_name'][$id];
+ $company_static->name_alias = $x_coll[$my_coll_rate]['company_alias'][$id];
+ $company_static->email = $x_coll[$my_coll_rate]['company_email'][$id];
+ $company_static->tva_intra = $x_coll[$my_coll_rate]['tva_intra'][$id];
+ $company_static->client = $x_coll[$my_coll_rate]['company_client'][$id];
+ $company_static->fournisseur = $x_coll[$my_coll_rate]['company_fournisseur'][$id];
+ $company_static->status = $x_coll[$my_coll_rate]['company_status'][$id];
+ $company_static->code_client = $x_coll[$my_coll_rate]['company_customer_code'][$id];
+ $company_static->code_compta_client = $x_coll[$my_coll_rate]['company_customer_accounting_code'][$id];
+ $company_static->code_fournisseur = $x_coll[$my_coll_rate]['company_supplier_code'][$id];
+ $company_static->code_compta_fournisseur = $x_coll[$my_coll_rate]['company_supplier_accounting_code'][$id];
+
$x_both[$my_coll_rate]['coll']['detail'][] = array(
'id' =>$x_coll[$my_coll_rate]['facid'][$id],
'descr' =>$x_coll[$my_coll_rate]['descr'][$id],
@@ -295,13 +257,16 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
'pref' =>$x_coll[$my_coll_rate]['pref'][$id],
'ptype' =>$x_coll[$my_coll_rate]['ptype'][$id],
'payment_id'=>$x_coll[$my_coll_rate]['payment_id'][$id],
+ 'payment_ref'=>$x_coll[$my_coll_rate]['payment_ref'][$id],
'payment_amount'=>$x_coll[$my_coll_rate]['payment_amount'][$id],
'ftotal_ttc'=>$x_coll[$my_coll_rate]['ftotal_ttc'][$id],
'dtotal_ttc'=>$x_coll[$my_coll_rate]['dtotal_ttc'][$id],
'dtype' =>$x_coll[$my_coll_rate]['dtype'][$id],
'datef' =>$x_coll[$my_coll_rate]['datef'][$id],
'datep' =>$x_coll[$my_coll_rate]['datep'][$id],
+
'company_link'=>$company_static->getNomUrl(1, '', 20),
+
'ddate_start'=>$x_coll[$my_coll_rate]['ddate_start'][$id],
'ddate_end' =>$x_coll[$my_coll_rate]['ddate_end'][$id],
'totalht' =>$x_coll[$my_coll_rate]['totalht_list'][$id],
@@ -335,6 +300,7 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
'pref' =>$x_paye[$my_paye_rate]['pref'][$id],
'ptype' =>$x_paye[$my_paye_rate]['ptype'][$id],
'payment_id' =>$x_paye[$my_paye_rate]['payment_id'][$id],
+ 'payment_ref' =>$x_paye[$my_paye_rate]['payment_ref'][$id],
'payment_amount' =>$x_paye[$my_paye_rate]['payment_amount'][$id],
'ftotal_ttc' =>price2num($x_paye[$my_paye_rate]['ftotal_ttc'][$id]),
'dtotal_ttc' =>price2num($x_paye[$my_paye_rate]['dtotal_ttc'][$id]),
@@ -349,7 +315,20 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
$invoice_supplier->id = $x_paye[$my_paye_rate]['facid'][$id];
$invoice_supplier->ref = $x_paye[$my_paye_rate]['facnum'][$id];
$invoice_supplier->type = $x_paye[$my_paye_rate]['type'][$id];
- $company_static->fetch($x_paye[$my_paye_rate]['company_id'][$id]);
+
+ $company_static->id = $x_paye[$my_paye_rate]['company_id'][$id];
+ $company_static->name = $x_paye[$my_paye_rate]['company_name'][$id];
+ $company_static->name_alias = $x_paye[$my_paye_rate]['company_alias'][$id];
+ $company_static->email = $x_paye[$my_paye_rate]['company_email'][$id];
+ $company_static->tva_intra = $x_paye[$my_paye_rate]['tva_intra'][$id];
+ $company_static->client = $x_paye[$my_paye_rate]['company_client'][$id];
+ $company_static->fournisseur = $x_paye[$my_paye_rate]['company_fournisseur'][$id];
+ $company_static->status = $x_paye[$my_paye_rate]['company_status'][$id];
+ $company_static->code_client = $x_paye[$my_paye_rate]['company_customer_code'][$id];
+ $company_static->code_compta_client = $x_paye[$my_paye_rate]['company_customer_accounting_code'][$id];
+ $company_static->code_fournisseur = $x_paye[$my_paye_rate]['company_supplier_code'][$id];
+ $company_static->code_compta_fournisseur = $x_paye[$my_paye_rate]['company_supplier_accounting_code'][$id];
+
$x_both[$my_paye_rate]['paye']['detail'][] = array(
'id' =>$x_paye[$my_paye_rate]['facid'][$id],
'descr' =>$x_paye[$my_paye_rate]['descr'][$id],
@@ -357,13 +336,16 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
'pref' =>$x_paye[$my_paye_rate]['pref'][$id],
'ptype' =>$x_paye[$my_paye_rate]['ptype'][$id],
'payment_id'=>$x_paye[$my_paye_rate]['payment_id'][$id],
+ 'payment_ref'=>$x_paye[$my_paye_rate]['payment_ref'][$id],
'payment_amount'=>$x_paye[$my_paye_rate]['payment_amount'][$id],
'ftotal_ttc'=>price2num($x_paye[$my_paye_rate]['ftotal_ttc'][$id]),
'dtotal_ttc'=>price2num($x_paye[$my_paye_rate]['dtotal_ttc'][$id]),
'dtype' =>$x_paye[$my_paye_rate]['dtype'][$id],
'datef' =>$x_paye[$my_paye_rate]['datef'][$id],
'datep' =>$x_paye[$my_paye_rate]['datep'][$id],
+
'company_link'=>$company_static->getNomUrl(1, '', 20),
+
'ddate_start'=>$x_paye[$my_paye_rate]['ddate_start'][$id],
'ddate_end' =>$x_paye[$my_paye_rate]['ddate_end'][$id],
'totalht' =>price2num($x_paye[$my_paye_rate]['totalht_list'][$id]),
@@ -383,11 +365,6 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
$x_paye_sum = 0;
$x_paye_ht = 0;
- $span = $columns;
- if ($modetax != 1) {
- $span += 2;
- }
-
//print ''..') ";
print '';
print $langs->trans('Rate') . ' : ' . vatrate($rate) . '%';
- print ' - ' . img_picto('', 'chevron-down', 'class="paddingrightonly"') . $langs->trans('VATReportShowByRateDetails') . ' ';
+ print ' - ' . img_picto('', 'chevron-down', 'class="paddingrightonly"') . $langs->trans('VATReportShowByRateDetails') . ' ';
print ' ';
print ' '."\n";
@@ -473,6 +454,19 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
if ($invoice_type == 'customer' && $vat_rate_show == $rate) {
if (is_array($x_both[$rate]['coll']['detail'])) {
foreach ($x_both[$rate]['coll']['detail'] as $index => $fields) {
+ /*$company_static->id = $fields['company_id'];
+ $company_static->name = $fields['company_name'];
+ $company_static->name_alias = $fields['company_alias'];
+ $company_static->email = $fields['company_email'];
+ $company_static->tva_intra = $fields['tva_intra'];
+ $company_static->client = $fields['company_client'];
+ $company_static->fournisseur = $fields['company_fournisseur'];
+ $company_static->status = $fields['company_status'];
+ $company_static->code_client = $fields['company_client'];
+ $company_static->code_compta_client = $fields['company_customer_code'];
+ $company_static->code_fournisseur = $fields['company_customer_accounting_code'];
+ $company_static->code_compta_fournisseur = $fields['company_supplier_accounting_code'];*/
+
// Define type
// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
@@ -499,7 +493,10 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
else print '' . $fields['company_link'] . ' ';
+ print '';
+ //print $company_static->getNomUrl(1);
+ print $fields['company_link'];
+ print ' ';
// Description
print '';
@@ -552,7 +549,8 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
//print $fields['totalht']."-".$fields['payment_amount']."-".$fields['ftotal_ttc'];
if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
$payment_static->id = $fields['payment_id'];
- print $payment_static->getNomUrl(2);
+ $payment_static->ref = $fields['payment_ref'];
+ print $payment_static->getNomUrl(2, '', '', 0).' ';
}
if (($type == 0 && $conf->global->TAX_MODE_SELL_PRODUCT == 'invoice')
|| ($type == 1 && $conf->global->TAX_MODE_SELL_SERVICE == 'invoice')) {
@@ -618,7 +616,7 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
// Blank line
print ' ';
print ''.$elementsup.' ';
print ''.$langs->trans("DateInvoice").' ';
@@ -642,7 +640,11 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
print " ";
print '';
print $langs->trans('Rate') . ' : ' . vatrate($rate) . '%';
- print ' - ' . img_picto('', 'chevron-down', 'class="paddingrightonly"') . $langs->trans('VATReportShowByRateDetails') . ' ';
+ print ' - ' . img_picto('', 'chevron-down', 'class="paddingrightonly"') . $langs->trans('VATReportShowByRateDetails') . ' ';
print ' ';
print ' '."\n";
@@ -684,6 +686,19 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
if ($invoice_type == 'supplier' && $vat_rate_show == $rate) {
foreach ($x_both[$rate]['paye']['detail'] as $index => $fields) {
+ /*$company_static->id = $fields['company_id'];
+ $company_static->name = $fields['company_name'];
+ $company_static->name_alias = $fields['company_alias'];
+ $company_static->email = $fields['company_email'];
+ $company_static->tva_intra = $fields['tva_intra'];
+ $company_static->client = $fields['company_client'];
+ $company_static->fournisseur = $fields['company_fournisseur'];
+ $company_static->status = $fields['company_status'];
+ $company_static->code_client = $fields['company_client'];
+ $company_static->code_compta_client = $fields['company_customer_code'];
+ $company_static->code_fournisseur = $fields['company_customer_accounting_code'];
+ $company_static->code_compta_fournisseur = $fields['company_supplier_accounting_code'];*/
+
// Define type
// We MUST use dtype (type in line). We can use something else, only if dtype is really unknown.
$type = (isset($fields['dtype']) ? $fields['dtype'] : $fields['ptype']);
@@ -713,7 +728,10 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
}
// Company name
- print '' . $fields['company_link'] . ' ';
+ print '';
+ //print $company_static->getNomUrl(1);
+ print $fields['company_link'];
+ print ' ';
// Description
print '';
@@ -765,7 +783,8 @@ if (!is_array($x_coll) || !is_array($x_paye)) {
print ' ';
if ($fields['payment_amount'] && $fields['ftotal_ttc']) {
$paymentfourn_static->id = $fields['payment_id'];
- print $paymentfourn_static->getNomUrl(2);
+ $paymentfourn_static->ref = $fields['payment_ref'];
+ print $paymentfourn_static->getNomUrl(2, '', '', 0).' ';
}
if (($type == 0 && $conf->global->TAX_MODE_BUY_PRODUCT == 'invoice')
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 53ebbdfddd9..3890155f116 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -458,7 +458,7 @@ if ($search_societe) {
$sql .= natural_search(empty($conf->global->SOCIETE_DISABLE_CONTACTS) ? 's.nom' : 'p.fk_soc', $search_societe);
}
if ($search_country) {
- $sql .= " AND p.fk_pays IN (".$search_country.')';
+ $sql .= " AND p.fk_pays IN (".$db->sanitize($search_country).')';
}
if (strlen($search_poste)) {
$sql .= natural_search('p.poste', $search_poste);
@@ -492,9 +492,8 @@ if (strlen($search_town)) {
$sql .= natural_search("p.town", $search_town);
}
if (count($search_roles) > 0) {
- $sql .= " AND p.rowid IN (SELECT sc.fk_socpeople FROM ".MAIN_DB_PREFIX."societe_contacts as sc WHERE sc.fk_c_type_contact IN (".implode(',', $search_roles)."))";
+ $sql .= " AND p.rowid IN (SELECT sc.fk_socpeople FROM ".MAIN_DB_PREFIX."societe_contacts as sc WHERE sc.fk_c_type_contact IN (".$db->sanitize(implode(',', $search_roles))."))";
}
-
if ($search_no_email != '' && $search_no_email >= 0) {
$sql .= " AND p.no_email = ".$db->escape($search_no_email);
}
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 5c7356fae00..8d2969a1370 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2004 Rodolphe Quiedeville
* Copyright (C) 2004-2011 Laurent Destailleur
* Copyright (C) 2005-2012 Regis Houssin
- * Copyright (C) 2018-2020 Frédéric France
+ * Copyright (C) 2018-2021 Frédéric France
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -119,7 +119,7 @@ if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/contactnameonly/', $c
$title = $object->lastname;
}
$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('', $title, $helpurl);
+llxHeader('', $title, $help_url);
$form = new Form($db);
diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php
index dc361a1f0b6..b725ef6f3f4 100644
--- a/htdocs/contrat/admin/contract_extrafields.php
+++ b/htdocs/contrat/admin/contract_extrafields.php
@@ -88,13 +88,7 @@ if ($action != 'create' && $action != 'edit') {
print "";
}
-
-/* ************************************************************************** */
-/* */
-/* Creation of an optional field */
-/* */
-/* ************************************************************************** */
-
+// Creation of an optional field
if ($action == 'create') {
print '
';
print load_fiche_titre($langs->trans('NewAttribute'));
@@ -102,11 +96,7 @@ if ($action == 'create') {
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
-/* ************************************************************************** */
-/* */
-/* Edition of an optional field */
-/* */
-/* ************************************************************************** */
+// Edition of an optional field
if ($action == 'edit' && !empty($attrname)) {
print '
';
print load_fiche_titre($langs->trans('NewAttribute'));
@@ -102,11 +96,7 @@ if ($action == 'create') {
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
-/* ************************************************************************** */
-/* */
-/* Edition d'un champ optionnel */
-/* */
-/* ************************************************************************** */
+// Edition of an optional field
if ($action == 'edit' && !empty($attrname)) {
print "trans("LabelOrTranslationKey"); ?> trans("LabelOrTranslationKey"); ?> trans("AttributeCode"); ?> (trans("AlphaNumOnlyLowerCharsAndNoSpace"); ?>) textwithpicto($langs->trans("HelpOnTooltip"), $langs->trans("HelpOnTooltipDesc")); ?> trans("AllEntities"); ?> trans("LabelOrTranslationKey"); ?> trans("LabelOrTranslationKey"); ?> trans("AttributeCode"); ?> textwithpicto($langs->trans("HelpOnTooltip"), $langs->trans("HelpOnTooltipDesc")); ?> trans("AllEntities"); ?> '.$langs->trans("AlwaysEditable").' ';
print ''.$form->textwithpicto($langs->trans("Visible"), $langs->trans("VisibleDesc")).' ';
print ''.$form->textwithpicto($langs->trans("DisplayOnPdf"), $langs->trans("DisplayOnPdfDesc")).' ';
print ''.$form->textwithpicto($langs->trans("Totalizable"), $langs->trans("TotalizableDesc")).' ';
-if (empty($conf->multicompany->enabled)) {
- print ''.$langs->trans("Entities").' ';
+if (!empty($conf->multicompany->enabled)) {
+ print ''.$langs->trans("Entity").' ';
}
print ' ';
print "\n";
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index 5ea0e4821d6..4c56b0223cd 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -35,7 +35,7 @@ if (!empty($extrafieldsobjectkey)) { // $extrafieldsobject is the $object->table
}
$value = $datenotinstring;
} else {
- $value = $obj->$tmpkey;
+ $value = (!empty($obj->$tmpkey) ? $obj->$tmpkey : '');
}
// If field is a computed field, we make computation to get value
if ($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]) {
diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
index 77329eb06a4..72f888f256a 100644
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@@ -37,17 +37,17 @@ if (!empty($extrafieldsobjectkey)) { // $extrafieldsobject is the $object->table
if (in_array($typeofextrafield, array('int', 'double'))) {
$searchclass = 'searchnum';
}
- print ' ';
}
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index de165c8c752..6ff7bba2390 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -71,7 +71,8 @@ print '';
// Toolbar
if ($permtoadd) {
- print '
';
+ $websitekeyandpageid = (!empty($websitekey) ? '&website='.$websitekey : '').(!empty($pageid) ? '&pageid='.$pageid : '');
+ print ' ';
print ' ';
} else {
diff --git a/htdocs/datapolicy/langs/en_US/datapolicy.lang b/htdocs/datapolicy/langs/en_US/datapolicy.lang
index ad5308ce8ce..368caffcbda 100644
--- a/htdocs/datapolicy/langs/en_US/datapolicy.lang
+++ b/htdocs/datapolicy/langs/en_US/datapolicy.lang
@@ -19,7 +19,7 @@ Module4100Name = Data Privacy Policy
Module4100Desc = Module to manage Data Privacy (Conformity with the GDPR)
#
-# Page d'administration
+# Administration page
#
datapolicySetup = Module Data Privacy Policy Setup
Deletion = Deletion of data
@@ -39,21 +39,21 @@ DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT = Nor prospect/Nor customer
DATAPOLICY_CONTACT_FOURNISSEUR = Supplier
DATAPOLICY_ADHERENT = Member
DATAPOLICY_Tooltip_SETUP = Type of contact - Indicate your choices for each type.
-DATAPOLICYMail=Emails Setup
-DATAPOLICYSUBJECTMAIL=Subject of email
-DATAPOLICYCONTENTMAIL=Content of the email
-DATAPOLICYSUBSITUTION=You can use the following variables in your email (LINKACCEPT allows to create a link recording the agreement of the person, LINKREFUSED makes it possible to record the refusal of the person):
-DATAPOLICYACCEPT=Message after agreement
-DATAPOLICYREFUSE=Message after desagreement
-SendAgreementText=You can send a GDPR email to all your relevant contacts (who have not yet received an email and for which you have not registered anything about their GDPR agreement). To do this, use the following button.
-SendAgreement=Send emails
+DATAPOLICYMail = Emails Setup
+DATAPOLICYSUBJECTMAIL = Subject of email
+DATAPOLICYCONTENTMAIL = Content of the email
+DATAPOLICYSUBSITUTION = You can use the following variables in your email (LINKACCEPT allows to create a link recording the agreement of the person, LINKREFUSED makes it possible to record the refusal of the person):
+DATAPOLICYACCEPT = Message after agreement
+DATAPOLICYREFUSE = Message after desagreement
+SendAgreementText = You can send a GDPR email to all your relevant contacts (who have not yet received an email and for which you have not registered anything about their GDPR agreement). To do this, use the following button.
+SendAgreement = Send emails
AllAgreementSend = All emails have been sent
-TXTLINKDATAPOLICYACCEPT= Text for the link "agreement"
-TXTLINKDATAPOLICYREFUSE= Text for the link "desagreement"
+TXTLINKDATAPOLICYACCEPT = Text for the link "agreement"
+TXTLINKDATAPOLICYREFUSE = Text for the link "desagreement"
#
-# Extrafield
+# Extrafields
#
DATAPOLICY_BLOCKCHECKBOX = GDPR : Processing of personal data
DATAPOLICY_consentement = Consent obtained for the processing of personal data
@@ -67,26 +67,26 @@ DATAPOLICY_POPUP_ANONYME_TITLE = Anonymize a thirdparty
DATAPOLICY_POPUP_ANONYME_TEXTE = You can not delete this contact from Dolibarr because there are related items. In accordance with the GDPR, you will make all this data anonymous to respect your obligations. Would you like to continue ?
#
-# Bouton portabilité
+# Button for portability
#
DATAPOLICY_PORTABILITE = Portability GDPR
DATAPOLICY_PORTABILITE_TITLE = Export of personal data
DATAPOLICY_PORTABILITE_CONFIRMATION = You want to export the personal data of this contact. Are you sure ?
#
-# Note ajoutés lors d'une anonymisation
+# Notes added during an anonymization
#
ANONYMISER_AT = Anonymised the %s
-#V2
-DATAPOLICYReturn=GDPR Validation
+# V2
+DATAPOLICYReturn = GDPR Validation
DATAPOLICY_date = Date of agreement/desagreement GDPR
DATAPOLICY_send = Date sending agreement email
DATAPOLICYReturn = GDPR Return
DATAPOLICY_SEND = Send GDPR email
MailSent = Email has been sent
-#ERROR
-ErrorSubjectIsRequired= Error : The subject of email is required. Indicate it in the module setup
+# ERROR
+ErrorSubjectIsRequired = Error : The subject of email is required. Indicate it in the module setup
=Due to a technical problem, we were unable to register your choice. We apologize for that. Contact us to send us your choice.
NUMBER_MONTH_BEFORE_DELETION = Number of month before deletion
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index 9798cd02eea..9a2d1402e17 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -106,7 +106,7 @@ $sql .= " p.rowid as pid, p.ref, p.title, p.public";
$sql .= " FROM ".MAIN_DB_PREFIX."don as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS p";
$sql .= " ON p.rowid = d.fk_projet WHERE d.entity IN (".getEntity('donation').")";
if ($search_status != '' && $search_status != '-4') {
- $sql .= " AND d.fk_statut IN (".$db->sanitize($db->escape($search_status)).")";
+ $sql .= " AND d.fk_statut IN (".$db->sanitize($search_status).")";
}
if (trim($search_ref) != '') {
$sql .= natural_search('d.ref', $search_ref);
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 7f28d40dd29..d91181d0c51 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -61,7 +61,7 @@ class ConferenceOrBooth extends ActionComm
/**
* @var string String with name of icon for conferenceorbooth. Must be the part after the 'object_' into object_conferenceorbooth.png
*/
- public $picto = 'conferenceorbooth@eventorganization';
+ public $picto = 'conferenceorbooth';
const STATUS_DRAFT = 0;
diff --git a/htdocs/eventorganization/conferenceorbooth_agenda.php b/htdocs/eventorganization/conferenceorbooth_agenda.php
index 54a3e5b9a4c..bd50df31a91 100644
--- a/htdocs/eventorganization/conferenceorbooth_agenda.php
+++ b/htdocs/eventorganization/conferenceorbooth_agenda.php
@@ -132,14 +132,17 @@ if ($id > 0 || !empty($ref)) {
$upload_dir = $conf->eventorganization->multidir_output[$object->entity]."/".$object->id;
}
-// Security check - Protection if external user
-//if ($user->socid > 0) accessforbidden();
-//if ($user->socid > 0) $socid = $user->socid;
-//$result = restrictedArea($user, 'eventorganization', $object->id);
+// Security check
+if ($user->socid > 0) {
+ accessforbidden();
+}
+$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
+$result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
$permissiontoadd = $user->rights->eventorganization->conferenceorbooth->write; // Used by the include of actions_addupdatedelete.inc.php
+
/*
* Actions
*/
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index e27e909d071..495d0334a10 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -17,7 +17,7 @@
*/
/**
- * \file event.php
+ * \file htdocs/eventorganization/conferenceorbooth_card.php
* \ingroup eventorganization
* \brief Page to create/edit/view conferenceorbooth
*/
@@ -85,14 +85,11 @@ $permissionnote = $user->rights->eventorganization->write; // Used by the includ
$permissiondellink = $user->rights->eventorganization->write; // Used by the include of actions_dellink.inc.php
$upload_dir = $conf->eventorganization->multidir_output[isset($object->entity) ? $object->entity : 1];
-// Security check - Protection if external user
+// Security check
if ($user->socid > 0) {
accessforbidden();
}
-if ($user->socid > 0) {
- $socid = $user->socid;
-}
-$isdraft = (($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
+$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
$result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
if (!$permissiontoread) {
diff --git a/htdocs/eventorganization/conferenceorbooth_contact.php b/htdocs/eventorganization/conferenceorbooth_contact.php
index e29252aef1e..d42cc78adcb 100644
--- a/htdocs/eventorganization/conferenceorbooth_contact.php
+++ b/htdocs/eventorganization/conferenceorbooth_contact.php
@@ -78,18 +78,21 @@ $extrafields->fetch_name_optionals_label($object->table_element);
// Load object
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-// Security check - Protection if external user
-//if ($user->socid > 0) accessforbidden();
-//if ($user->socid > 0) $socid = $user->socid;
-//$result = restrictedArea($user, 'eventorganization', $object->id);
+// Security check
+if ($user->socid > 0) {
+ accessforbidden();
+}
+$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
+$result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
$permission = $user->rights->eventorganization->conferenceorbooth->write;
+
/*
- * Add a new contact
+ * Actions
*/
-if ($action == 'addcontact' && $permission) {
+if ($action == 'addcontact' && $permission) { // Add a new contact
$contactid = (GETPOST('userid') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
$typeid = (GETPOST('typecontact') ? GETPOST('typecontact') : GETPOST('type'));
$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php
index 7b8094e3034..1f354453fd1 100644
--- a/htdocs/eventorganization/conferenceorbooth_document.php
+++ b/htdocs/eventorganization/conferenceorbooth_document.php
@@ -124,13 +124,14 @@ if ($id > 0 || !empty($ref)) {
$upload_dir = $conf->eventorganization->multidir_output[$object->entity ? $object->entity : $conf->entity]."/conferenceorbooth/".get_exdir(0, 0, 0, 1, $object);
}
-// Security check - Protection if external user
-//if ($user->socid > 0) accessforbidden();
-//if ($user->socid > 0) $socid = $user->socid;
-//$result = restrictedArea($user, 'eventorganization', $object->id);
-
$permissiontoadd = $user->rights->eventorganization->conferenceorbooth->write; // Used by the include of actions_addupdatedelete.inc.php
+// Security check
+if ($user->socid > 0) {
+ accessforbidden();
+}
+$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
+$result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
/*
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index 6632e8a1f29..89e614cc3ba 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -132,17 +132,12 @@ $permissiontoadd = $user->rights->eventorganization->write;
$permissiontodelete = $user->rights->eventorganization->delete;
// Security check
-if (empty($conf->eventorganization->enabled)) {
- accessforbidden('Module not enabled');
-}
-$socid = 0;
+//$socid = 0;
if ($user->socid > 0) { // Protection if external user
//$socid = $user->socid;
accessforbidden();
}
-//$result = restrictedArea($user, 'eventorganization', $id, '');
-//if (!$permissiontoread) accessforbidden();
-
+$result = restrictedArea($user, 'eventorganization');
/*
@@ -270,7 +265,7 @@ if ($projectid > 0) {
// Define a complementary filter for search of next/prev ref.
if (!$user->rights->project->all->lire) {
$objectsListId = $project->getProjectsAuthorizedForUser($user, 0, 0);
- $project->next_prev_filter = " rowid in (".(count($objectsListId) ?join(',', array_keys($objectsListId)) : '0').")";
+ $project->next_prev_filter = " rowid IN (".$db->sanitize(count($objectsListId) ? join(',', array_keys($objectsListId)) : '0').")";
}
dol_banner_tab($project, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
@@ -559,9 +554,9 @@ print '
';
print '
';
print '
';
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/eventorganization/conferenceorbooth_card.php', 1).'?action=create'.(!empty($project->id)?'&fk_project='.$project->id:'').(!empty($project->socid)?'&fk_soc='.$project->socid:'').'&backtopage='.urlencode($_SERVER['PHP_SELF']).(!empty($project->id)?'?projectid='.$project->id:''), '', $permissiontoadd);
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/eventorganization/conferenceorbooth_card.php?action=create'.(!empty($project->id)?'&fk_project='.$project->id:'').(!empty($project->socid)?'&fk_soc='.$project->socid:'').'&backtopage='.urlencode($_SERVER['PHP_SELF']).(!empty($project->id)?'?projectid='.$project->id:''), '', $permissiontoadd);
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
// Add code for pre mass action (confirmation or email presend form)
$topicmail = "SendConferenceOrBoothRef";
diff --git a/htdocs/eventorganization/conferenceorbooth_note.php b/htdocs/eventorganization/conferenceorbooth_note.php
index 61c8ba957e6..634877d82fe 100644
--- a/htdocs/eventorganization/conferenceorbooth_note.php
+++ b/htdocs/eventorganization/conferenceorbooth_note.php
@@ -109,6 +109,12 @@ if ($id > 0 || !empty($ref)) {
$permissionnote = $user->rights->eventorganization->conferenceorbooth->write; // Used by the include of actions_setnotes.inc.php
$permissiontoadd = $user->rights->eventorganization->conferenceorbooth->write; // Used by the include of actions_addupdatedelete.inc.php
+// Security check
+if ($user->socid > 0) {
+ accessforbidden();
+}
+$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
+$result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
/*
diff --git a/htdocs/eventorganization/eventorganizationindex.php b/htdocs/eventorganization/eventorganizationindex.php
index 999d85255d0..d5c158ab860 100644
--- a/htdocs/eventorganization/eventorganizationindex.php
+++ b/htdocs/eventorganization/eventorganizationindex.php
@@ -25,57 +25,26 @@
*/
// Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
- $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
- $i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
- $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
- $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
- $res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
- $res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
- $res = @include "../../../main.inc.php";
-}
-if (!$res) {
- die("Include of main fails");
-}
-
+require '../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
// Load translation files required by the page
-$langs->loadLangs(array("eventorganization@eventorganization"));
+$langs->loadLangs(array("eventorganization"));
$action = GETPOST('action', 'aZ09');
-
-// Security check
-// if (! $user->rights->eventorganization->myobject->read) {
-// accessforbidden();
-// }
-$socid = GETPOST('socid', 'int');
-if (isset($user->socid) && $user->socid > 0) {
- $action = '';
- $socid = $user->socid;
-}
-
$max = 5;
$now = dol_now();
+// Security check
+//$socid = 0;
+if ($user->socid > 0) { // Protection if external user
+ //$socid = $user->socid;
+ accessforbidden();
+}
+$result = restrictedArea($user, 'eventorganization');
+
+
/*
* Actions
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index f46891b6847..7e10b5b5f1f 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -126,6 +126,12 @@ $permissiondellink = $user->rights->expedition->delivery->creer; // Used by the
$date_delivery = dol_mktime(GETPOST('date_deliveryhour', 'int'), GETPOST('date_deliverymin', 'int'), 0, GETPOST('date_deliverymonth', 'int'), GETPOST('date_deliveryday', 'int'), GETPOST('date_deliveryyear', 'int'));
+// Security check
+if ($user->socid) {
+ $socid = $user->socid;
+}
+$result = restrictedArea($user, 'expedition', $object->id, '');
+
/*
* Actions
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 42564f7dd72..cc5267cdd47 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -129,7 +129,7 @@ class Shipments extends DolibarrApi
$sql .= " AND t.fk_soc = sc.fk_soc";
}
if ($socids) {
- $sql .= " AND t.fk_soc IN (".$socids.")";
+ $sql .= " AND t.fk_soc IN (".$this->db->sanitize($socids).")";
}
if ($search_sale > 0) {
$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index a096b2155ce..174b97b4a7e 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -41,12 +41,6 @@ $id = GETPOST('id', 'int');
$ref = GETPOST('ref', 'alpha');
$action = GETPOST('action', 'aZ09');
-// Security check
-if ($user->socid) {
- $socid = $user->socid;
-}
-$result = restrictedArea($user, 'expedition', $id, '');
-
$object = new Expedition($db);
if ($id > 0 || !empty($ref)) {
$object->fetch($id, $ref);
@@ -69,6 +63,12 @@ if ($id > 0 || !empty($ref)) {
}
}
+// Security check
+if ($user->socid) {
+ $socid = $user->socid;
+}
+$result = restrictedArea($user, 'expedition', $object->id, '');
+
/*
* Actions
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 836b469cb77..faff2a8d0a0 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -45,12 +45,6 @@ $confirm = GETPOST('confirm');
$id = GETPOST('id', 'int');
$ref = GETPOST('ref');
-// Security check
-if ($user->socid) {
- $socid = $user->socid;
-}
-$result = restrictedArea($user, 'expedition', $id, '');
-
// Get parameters
$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha');
@@ -71,14 +65,21 @@ if (!$sortfield) {
$object = new Expedition($db);
+if ($object->fetch($id, $ref)) {
+ $object->fetch_thirdparty();
+ $upload_dir = $conf->expedition->dir_output."/sending/".dol_sanitizeFileName($object->ref);
+}
+
+// Security check
+if ($user->socid) {
+ $socid = $user->socid;
+}
+$result = restrictedArea($user, 'expedition', $object->id, '');
+
/*
* Actions
*/
-if ($object->fetch($id)) {
- $object->fetch_thirdparty();
- $upload_dir = $conf->expedition->dir_output."/sending/".dol_sanitizeFileName($object->ref);
-}
include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 327e9a030e0..a4a09e06808 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -313,13 +313,13 @@ if ($search_state) {
$sql .= natural_search("state.nom", $search_state);
}
if ($search_country) {
- $sql .= " AND s.fk_pays IN (".$search_country.')';
+ $sql .= " AND s.fk_pays IN (".$db->sanitize($search_country).')';
}
if ($search_tracking) {
$sql .= natural_search("e.tracking_number", $search_tracking);
}
if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
- $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
+ $sql .= " AND s.fk_typent IN (".$db->sanitize($search_type_thirdparty).')';
}
if ($search_sale > 0) {
$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".$search_sale;
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index c8209910b48..db28e409309 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -39,13 +39,6 @@ $id = (GETPOST('id', 'int') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); //
$ref = GETPOST('ref', 'alpha');
$action = GETPOST('action', 'aZ09');
-// Security check
-$socid = '';
-if ($user->socid) {
- $socid = $user->socid;
-}
-$result = restrictedArea($user, $origin, $origin_id);
-
$object = new Expedition($db);
if ($id > 0 || !empty($ref)) {
$object->fetch($id, $ref);
@@ -66,10 +59,18 @@ if ($id > 0 || !empty($ref)) {
$objectsrc = new Propal($db);
$objectsrc->fetch($object->$typeobject->id);
}
+
+ $upload_dir = $conf->expedition->dir_output."/sending/".dol_sanitizeFileName($object->ref);
}
$permissionnote = $user->rights->expedition->creer; // Used by the include of actions_setnotes.inc.php
+// Security check
+if ($user->socid) {
+ $socid = $user->socid;
+}
+$result = restrictedArea($user, 'expedition', $object->id, '');
+
/*
* Actions
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index 66efd5c4ca7..809b4803ff5 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -73,6 +73,11 @@ $extrafields->fetch_name_optionals_label($object->table_element);
// Load object
include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
+// Security check
+if ($user->socid) {
+ $socid = $user->socid;
+}
+$result = restrictedArea($user, 'expedition', $object->id, '');
diff --git a/htdocs/expedition/stats/index.php b/htdocs/expedition/stats/index.php
index 151edbdba2b..6bdc495472c 100644
--- a/htdocs/expedition/stats/index.php
+++ b/htdocs/expedition/stats/index.php
@@ -39,7 +39,7 @@ if ($user->socid > 0) {
$socid = $user->socid;
}
-$nowyear = strftime("%Y", dol_now());
+$nowyear = dol_print_date(dol_now(), "%Y");
$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
//$startyear=$year-2;
$startyear = $year - 1;
@@ -48,6 +48,12 @@ $endyear = $year;
// Load translation files required by the page
$langs->loadLangs(array('sendings', 'other', 'companies'));
+// Security check
+if ($user->socid) {
+ $socid = $user->socid;
+}
+restrictedArea($user, 'expedition');
+
/*
* View
diff --git a/htdocs/expedition/stats/month.php b/htdocs/expedition/stats/month.php
index 74455d7dca2..254fd9aad90 100644
--- a/htdocs/expedition/stats/month.php
+++ b/htdocs/expedition/stats/month.php
@@ -29,6 +29,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
$year = GETPOST('year', 'int');
+// Security check
+if ($user->socid) {
+ $socid = $user->socid;
+}
+restrictedArea($user, 'expedition');
+
/*
* View
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index 98da4534e0c..13148e4247a 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -108,7 +108,7 @@ class ExpenseReports extends DolibarrApi
$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as t";
$sql .= ' WHERE t.entity IN ('.getEntity('expensereport').')';
if ($user_ids) {
- $sql .= " AND t.fk_user_author IN (".$user_ids.")";
+ $sql .= " AND t.fk_user_author IN (".$this->db->sanitize($user_ids).")";
}
// Add sql filters
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 89178693a43..496f57812a6 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -2367,8 +2367,8 @@ class ExpenseReport extends CommonObject
$sql .= " AND ex.entity IN (".getEntity('expensereport').")";
if (empty($user->rights->expensereport->readall)) {
$userchildids = $user->getAllChildIds(1);
- $sql .= " AND (ex.fk_user_author IN (".join(',', $userchildids).")";
- $sql .= " OR ex.fk_user_validator IN (".join(',', $userchildids)."))";
+ $sql .= " AND (ex.fk_user_author IN (".$this->db->sanitize(join(',', $userchildids)).")";
+ $sql .= " OR ex.fk_user_validator IN (".$this->db->sanitize(join(',', $userchildids))."))";
}
$resql = $this->db->query($sql);
@@ -2414,8 +2414,8 @@ class ExpenseReport extends CommonObject
$sql .= " AND ex.entity IN (".getEntity('expensereport').")";
if (empty($user->rights->expensereport->readall)) {
$userchildids = $user->getAllChildIds(1);
- $sql .= " AND (ex.fk_user_author IN (".join(',', $userchildids).")";
- $sql .= " OR ex.fk_user_validator IN (".join(',', $userchildids)."))";
+ $sql .= " AND (ex.fk_user_author IN (".$this->db->sanitize(join(',', $userchildids)).")";
+ $sql .= " OR ex.fk_user_validator IN (".$this->db->sanitize(join(',', $userchildids))."))";
}
$resql = $this->db->query($sql);
diff --git a/htdocs/expensereport/class/expensereportstats.class.php b/htdocs/expensereport/class/expensereportstats.class.php
index 3d627cbce8d..ec71f530f51 100644
--- a/htdocs/expensereport/class/expensereportstats.class.php
+++ b/htdocs/expensereport/class/expensereportstats.class.php
@@ -78,11 +78,11 @@ class ExpenseReportStats extends Stats
if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)) {
$childids = $user->getAllChildIds();
$childids[] = $user->id;
- $this->where .= " AND e.fk_user_author IN (".(join(',', $childids)).")";
+ $this->where .= " AND e.fk_user_author IN (".$this->db->sanitize(join(',', $childids)).")";
}
if ($this->userid > 0) {
- $this->where .= ' AND e.fk_user_author = '.$this->userid;
+ $this->where .= ' AND e.fk_user_author = '.((int) $this->userid);
}
}
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 541c2c0738e..f9792d5b68c 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -91,7 +91,7 @@ if (empty($user->rights->expensereport->readall) && empty($user->rights->expense
&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
$childids = $user->getAllChildIds();
$childids[] = $user->id;
- $sql .= " AND d.fk_user_author IN (".join(',', $childids).")\n";
+ $sql .= " AND d.fk_user_author IN (".$db->sanitize(join(',', $childids)).")\n";
}
$sql .= " GROUP BY tf.code, tf.label";
@@ -180,11 +180,11 @@ if (empty($user->rights->expensereport->readall) && empty($user->rights->expense
&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
$childids = $user->getAllChildIds();
$childids[] = $user->id;
- $sql .= " AND d.fk_user_author IN (".join(',', $childids).")\n";
+ $sql .= " AND d.fk_user_author IN (".$db->sanitize(join(',', $childids)).")\n";
}
$sql .= ' AND d.entity IN ('.getEntity('expensereport').')';
if (!$user->rights->societe->client->voir && !$user->socid) {
- $sql .= " AND d.fk_user_author = s.rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+ $sql .= " AND d.fk_user_author = s.rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
}
if ($socid) {
$sql .= " AND d.fk_user_author = ".$socid;
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 35642ead0c4..51022f8c40b 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -290,12 +290,12 @@ if ($search_user != '' && $search_user >= 0) {
}
// Status
if ($search_status != '' && $search_status >= 0) {
- $sql .= " AND d.fk_statut IN (".$db->sanitize($db->escape($search_status)).")";
+ $sql .= " AND d.fk_statut IN (".$db->sanitize($search_status).")";
}
// RESTRICT RIGHTS
if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
&& (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
- $sql .= " AND d.fk_user_author IN (".join(',', $childids).")\n";
+ $sql .= " AND d.fk_user_author IN (".$db->sanitize(join(',', $childids)).")\n";
}
// Add where from extra fields
include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index dc23a8ab362..b3d0cf49a32 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -154,6 +154,9 @@ $upload_dir = $conf->export->dir_temp.'/'.$user->id;
//$usefilters=($conf->global->MAIN_FEATURES_LEVEL > 1);
$usefilters = 1;
+// Security check
+$result = restrictedArea($user, 'export');
+
/*
* Actions
@@ -449,7 +452,7 @@ if ($step == 1 || !$datatoexport) {
if ($objexport->array_export_perms[$key]) {
print '
'.img_picto($langs->trans("NewExport"), 'next', 'class="fa-15x"').' ';
} else {
- print $langs->trans("NotEnoughPermissions");
+ print '
'.$langs->trans("NotEnoughPermissions").' ';
}
print '';
}
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index 22b1729550d..3ba5e0a3591 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -27,11 +27,12 @@ require_once DOL_DOCUMENT_ROOT.'/exports/class/export.class.php';
// Load translation files required by the page
$langs->load("exports");
+$export = new Export($db);
+$export->load_arrays($user);
+
// Security check
$result = restrictedArea($user, 'export');
-$export = new Export($db);
-$export->load_arrays($user);
/*
* View
diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php
index 2fec51a0f5b..552d9f70c97 100644
--- a/htdocs/fichinter/admin/fichinter_extrafields.php
+++ b/htdocs/fichinter/admin/fichinter_extrafields.php
@@ -87,13 +87,7 @@ if ($action != 'create' && $action != 'edit') {
print "
';
print load_fiche_titre($langs->trans('NewAttribute'));
@@ -101,11 +95,7 @@ if ($action == 'create') {
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
-/* ************************************************************************** */
-/* */
-/* Edition of an optional field */
-/* */
-/* ************************************************************************** */
+// Edition of an optional field
if ($action == 'edit' && !empty($attrname)) {
print "
';
print load_fiche_titre($langs->trans('NewAttribute'));
@@ -102,11 +96,7 @@ if ($action == 'create') {
require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
}
-/* ************************************************************************** */
-/* */
-/* Edition d'un champ optionnel */
-/* */
-/* ************************************************************************** */
+// Edition of an optional field
if ($action == 'edit' && !empty($attrname)) {
print "'.$langs->trans("Payment").' '.$langs->trans("Payment").' '.$langs->trans("Ref").': '.$text;
if ($this->datepaye ? $this->datepaye : $this->date) {
- $label .= ''.$langs->trans("Date").': '.dol_print_date($this->datepaye ? $this->datepaye : $this->date, 'dayhour');
+ $label .= ''.$langs->trans("Date").': '.dol_print_date($this->datepaye ? $this->datepaye : $this->date, 'dayhour', 'tzuser');
}
- $linkstart = '';
+ $linkclose = '';
+ if (empty($notooltip)) {
+ if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+ $label = $langs->trans("Payment");
+ $linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+ }
+ $linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+ $linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+ } else {
+ $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+ }
+
+ $linkstart = ' ';
$linkend = ' ';
$result .= $linkstart;
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
deleted file mode 100644
index 7019b90b868..00000000000
--- a/htdocs/fourn/facture/impayees.php
+++ /dev/null
@@ -1,327 +0,0 @@
-
- * Copyright (C) 2004 Eric Seigne
- * Copyright (C) 2004-2012 Laurent Destailleur
- * Copyright (C) 2005-2012 Regis Houssin
- * Copyright (C) 2012 Vinicius Nogueira
- * Copyright (C) 2012 Juanjo Menent
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see '.$langs->trans("ShowUnpaidLateOnly").' ';
- } elseif ($option == 'late') {
- $link = ''.$langs->trans("ShowUnpaidAll").' ';
- }
- print load_fiche_titre($titre, $link);
-
- print_barre_liste('', '', $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', 0); // We don't want pagination on this page
- $i = 0;
- print '';
-
- $db->free($resql);
- } else {
- dol_print_error($db);
- }
-}
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/fourn/facture/index.php b/htdocs/fourn/facture/index.php
index 8904310bf3e..1e3c4f5e686 100644
--- a/htdocs/fourn/facture/index.php
+++ b/htdocs/fourn/facture/index.php
@@ -16,7 +16,7 @@
*/
/**
- * \file htdocs/forun/facture/index.php
+ * \file htdocs/fourn/facture/index.php
* \ingroup facture
* \brief Home page of customer invoices area
*/
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 7c6ed0c5e16..50fdfef6e47 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -475,14 +475,14 @@ $sql .= " state.code_departement as state_code, state.nom as state_name,";
$sql .= " country.code as country_code,";
$sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
$sql .= " u.login";
+if ($search_categ_sup && $search_categ_sup != '-1') {
+ $sql .= ", cs.fk_categorie, cs.fk_soc";
+}
// We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
// TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
if (!$search_all) {
$sql .= ', SUM(pf.amount) as dynamount_payed';
}
-if ($search_categ_sup) {
- $sql .= ", cs.fk_categorie, cs.fk_soc";
-}
// Add fields from extrafields
if (!empty($extrafields->attributes[$object->table_element]['label'])) {
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
@@ -580,10 +580,10 @@ if ($search_state) {
$sql .= natural_search("state.nom", $search_state);
}
if ($search_country) {
- $sql .= " AND s.fk_pays IN (".$search_country.')';
+ $sql .= " AND s.fk_pays IN (".$db->sanitize($search_country).')';
}
if ($search_type_thirdparty != '' && $search_type_thirdparty >= 0) {
- $sql .= " AND s.fk_typent IN (".$search_type_thirdparty.')';
+ $sql .= " AND s.fk_typent IN (".$db->sanitize($search_type_thirdparty).')';
}
if ($search_montant_ht != '') {
$sql .= natural_search('f.total_ht', $search_montant_ht, 1);
@@ -677,6 +677,9 @@ if (!$search_all) {
$sql .= ' country.code,';
$sql .= " p.rowid, p.ref, p.title,";
$sql .= " u.login";
+ if ($search_categ_sup && $search_categ_sup != '-1') {
+ $sql .= ", cs.fk_categorie, cs.fk_soc";
+ }
if (!empty($extrafields->attributes[$object->table_element]['label'])) {
foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
//prevent error with sql_mode=only_full_group_by
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 02adee36149..305c7bedba5 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -9,7 +9,7 @@
* Copyright (C) 2015 Marcos García
* Copyright (C) 2015 Juanjo Menent
* Copyright (C) 2017 Alexandre Spangaro
- * Copyright (C) 2018 Frédéric France
+ * Copyright (C) 2018-2021 Frédéric France
* Copyright (C) 2020 Tobias Sekan
*
* This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,7 @@
*/
/**
- * \file htdocs/fourn/paiment/list.php
+ * \file htdocs/fourn/paiement/list.php
* \ingroup fournisseur,facture
* \brief Payment list for supplier invoices
*/
@@ -59,9 +59,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
$langs->loadLangs(array('companies', 'bills', 'banks', 'compta'));
$action = GETPOST('action', 'alpha');
-$massaction = GETPOST('massaction', 'alpha');
+$massaction = GETPOST('massaction', 'alpha');
$optioncss = GETPOST('optioncss', 'alpha');
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'vendorpaymentlist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'vendorpaymentlist';
$socid = GETPOST('socid', 'int');
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 7943df254c1..4b5c742b3f1 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -479,7 +479,7 @@ class Holiday extends CommonObject
$sql .= " FROM ".MAIN_DB_PREFIX."holiday as cp, ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
$sql .= " WHERE cp.entity IN (".getEntity('holiday').")";
$sql .= " AND cp.fk_user = uu.rowid AND cp.fk_validator = ua.rowid"; // Hack pour la recherche sur le tableau
- $sql .= " AND cp.fk_user IN (".$user_id.")";
+ $sql .= " AND cp.fk_user IN (".$this->db->sanitize($user_id).")";
// Selection filter
if (!empty($filter)) {
@@ -1122,7 +1122,7 @@ class Holiday extends CommonObject
$sql .= " AND cp.fk_user = ".(int) $fk_user;
$sql .= " AND cp.date_debut <= '".$this->db->idate($timestamp)."' AND cp.date_fin >= '".$this->db->idate($timestamp)."'";
if ($status != '-1') {
- $sql .= " AND cp.statut IN (".$this->db->sanitize($this->db->escape($status)).")";
+ $sql .= " AND cp.statut IN (".$this->db->sanitize($status).")";
}
$resql = $this->db->query($sql);
@@ -2209,8 +2209,8 @@ class Holiday extends CommonObject
$sql .= " AND h.entity IN (".getEntity('holiday').")";
if (empty($user->rights->expensereport->readall)) {
$userchildids = $user->getAllChildIds(1);
- $sql .= " AND (h.fk_user IN (".join(',', $userchildids).")";
- $sql .= " OR h.fk_validator IN (".join(',', $userchildids)."))";
+ $sql .= " AND (h.fk_user IN (".$this->db->sanitize(join(',', $userchildids)).")";
+ $sql .= " OR h.fk_validator IN (".$this->db->sanitize(join(',', $userchildids))."))";
}
$resql = $this->db->query($sql);
@@ -2251,8 +2251,8 @@ class Holiday extends CommonObject
$sql .= " AND h.entity IN (".getEntity('holiday').")";
if (empty($user->rights->expensereport->read_all)) {
$userchildids = $user->getAllChildIds(1);
- $sql .= " AND (h.fk_user IN (".join(',', $userchildids).")";
- $sql .= " OR h.fk_validator IN (".join(',', $userchildids)."))";
+ $sql .= " AND (h.fk_user IN (".$this->db->sanitize(join(',', $userchildids)).")";
+ $sql .= " OR h.fk_validator IN (".$this->db->sanitize(join(',', $userchildids))."))";
}
$resql = $this->db->query($sql);
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index e57e12dcaee..b3d2c25adda 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -230,7 +230,7 @@ $filters = '';
$userchilds = array();
if (empty($user->rights->holiday->readall)) {
$userchilds = $user->getAllChildIds(1);
- $filters .= ' AND u.rowid IN ('.join(', ', $userchilds).')';
+ $filters .= ' AND u.rowid IN ('.$db->sanitize(join(', ', $userchilds)).')';
}
if (!empty($search_name)) {
$filters .= natural_search(array('u.firstname', 'u.lastname'), $search_name);
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index 4474aecf748..f49a3145af9 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -341,10 +341,10 @@ if (!empty($search_status) && $search_status != -1) {
}
if (empty($user->rights->holiday->readall)) {
- $sql .= ' AND cp.fk_user IN ('.join(',', $childids).')';
+ $sql .= ' AND cp.fk_user IN ('.$db->sanitize(join(',', $childids)).')';
}
if ($id > 0) {
- $sql .= " AND cp.fk_user IN (".$id.")";
+ $sql .= " AND cp.fk_user IN (".$db->sanitize($id).")";
}
// Add where from extra fields
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index 37497fd1810..62991a6e0ee 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -154,7 +154,7 @@ if (!empty($search_employee)) {
$sql .= " AND cp.fk_user = '".$db->escape($search_employee)."'";
}
if (!empty($search_type)) {
- $sql .= ' AND cp.fk_type IN ('.$db->escape($search_type).')';
+ $sql .= ' AND cp.fk_type IN ('.$db->sanitize($search_type).')';
}
if (!empty($search_description)) {
$sql .= natural_search('cp.description', $search_description);
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index e40ceb3f9ba..f169ce60b37 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -182,7 +182,7 @@ if (!empty($conf->holiday->enabled) && $user->rights->holiday->read) {
$sql .= " WHERE u.rowid = x.fk_user";
$sql .= " AND x.entity = ".$conf->entity;
if (empty($user->rights->holiday->readall)) {
- $sql .= ' AND x.fk_user IN ('.join(',', $childids).')';
+ $sql .= ' AND x.fk_user IN ('.$db->sanitize(join(',', $childids)).')';
}
//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND x.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
//if (!empty($socid)) $sql.= " AND x.fk_soc = ".$socid;
@@ -263,7 +263,7 @@ if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->lire)
$sql .= " WHERE u.rowid = x.fk_user_author";
$sql .= " AND x.entity = ".$conf->entity;
if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)) {
- $sql .= ' AND x.fk_user_author IN ('.join(',', $childids).')';
+ $sql .= ' AND x.fk_user_author IN ('.$db->sanitize(join(',', $childids)).')';
}
//if (!$user->rights->societe->client->voir && !$user->socid) $sql.= " AND x.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
//if (!empty($socid)) $sql.= " AND x.fk_soc = ".$socid;
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
deleted file mode 100644
index 406dbe0e8e2..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/AbstractPDOTest.php
+++ /dev/null
@@ -1,1431 +0,0 @@
-dropTables([
- 'calendarobjects',
- 'calendars',
- 'calendarinstances',
- 'calendarchanges',
- 'calendarsubscriptions',
- 'schedulingobjects',
- ]);
- $this->createSchema('calendars');
-
- $this->pdo = $this->getDb();
-
- }
-
- function testConstruct() {
-
- $backend = new PDO($this->pdo);
- $this->assertTrue($backend instanceof PDO);
-
- }
-
- /**
- * @depends testConstruct
- */
- function testGetCalendarsForUserNoCalendars() {
-
- $backend = new PDO($this->pdo);
- $calendars = $backend->getCalendarsForUser('principals/user2');
- $this->assertEquals([], $calendars);
-
- }
-
- /**
- * @depends testConstruct
- */
- function testCreateCalendarAndFetch() {
-
- $backend = new PDO($this->pdo);
- $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 = [
- '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'),
- 'share-access' => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER,
- ];
-
- $this->assertInternalType('array', $calendars);
- $this->assertEquals(1, count($calendars));
-
- foreach ($elementCheck as $name => $value) {
-
- $this->assertArrayHasKey($name, $calendars[0]);
- $this->assertEquals($value, $calendars[0][$name]);
-
- }
-
- }
-
- /**
- * @depends testConstruct
- */
- function testUpdateCalendarAndFetch() {
-
- $backend = new PDO($this->pdo);
-
- //Creating a new calendar
- $newId = $backend->createCalendar('principals/user2', 'somerandomid', []);
-
- $propPatch = new PropPatch([
- '{DAV:}displayname' => 'myCalendar',
- '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp' => new CalDAV\Xml\Property\ScheduleCalendarTransp('transparent'),
- ]);
-
- // Updating the calendar
- $backend->updateCalendar($newId, $propPatch);
- $result = $propPatch->commit();
-
- // Verifying the result of the update
- $this->assertTrue($result);
-
- // Fetching all calendars from this user
- $calendars = $backend->getCalendarsForUser('principals/user2');
-
- // Checking if all the information is still correct
- $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));
-
- foreach ($elementCheck as $name => $value) {
-
- $this->assertArrayHasKey($name, $calendars[0]);
- $this->assertEquals($value, $calendars[0][$name]);
-
- }
-
- }
-
- /**
- * @depends testConstruct
- * @expectedException \InvalidArgumentException
- */
- function testUpdateCalendarBadId() {
-
- $backend = new PDO($this->pdo);
-
- //Creating a new calendar
- $newId = $backend->createCalendar('principals/user2', 'somerandomid', []);
-
- $propPatch = new PropPatch([
- '{DAV:}displayname' => 'myCalendar',
- '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp' => new CalDAV\Xml\Property\ScheduleCalendarTransp('transparent'),
- ]);
-
- // Updating the calendar
- $backend->updateCalendar('raaaa', $propPatch);
-
- }
-
- /**
- * @depends testUpdateCalendarAndFetch
- */
- function testUpdateCalendarUnknownProperty() {
-
- $backend = new PDO($this->pdo);
-
- //Creating a new calendar
- $newId = $backend->createCalendar('principals/user2', 'somerandomid', []);
-
- $propPatch = new PropPatch([
- '{DAV:}displayname' => 'myCalendar',
- '{DAV:}yourmom' => 'wittycomment',
- ]);
-
- // Updating the calendar
- $backend->updateCalendar($newId, $propPatch);
- $propPatch->commit();
-
- // Verifying the result of the update
- $this->assertEquals([
- '{DAV:}yourmom' => 403,
- '{DAV:}displayname' => 424,
- ], $propPatch->getResult());
-
- }
-
- /**
- * @depends testCreateCalendarAndFetch
- */
- function testDeleteCalendar() {
-
- $backend = new PDO($this->pdo);
- $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([], $calendars);
-
- }
-
- /**
- * @depends testCreateCalendarAndFetch
- * @expectedException \InvalidArgumentException
- */
- function testDeleteCalendarBadID() {
-
- $backend = new PDO($this->pdo);
- $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('bad-id');
-
- }
-
- /**
- * @depends testCreateCalendarAndFetch
- * @expectedException \Sabre\DAV\Exception
- */
- function testCreateCalendarIncorrectComponentSet() {;
-
- $backend = new PDO($this->pdo);
-
- //Creating a new calendar
- $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', []);
-
- $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\'');
-
- $row = $result->fetch(\PDO::FETCH_ASSOC);
- if (is_resource($row['calendardata'])) {
- $row['calendardata'] = stream_get_contents($row['calendardata']);
- }
-
- $this->assertEquals([
- 'etag' => md5($object),
- 'size' => strlen($object),
- 'calendardata' => $object,
- 'firstoccurence' => strtotime('20120101'),
- 'lastoccurence' => strtotime('20120101') + (3600 * 24),
- 'componenttype' => 'VEVENT',
- ], $row);
-
- }
- function testGetMultipleObjects() {
-
- $backend = new PDO($this->pdo);
- $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, 'id-1', $object);
- $backend->createCalendarObject($returnedId, 'id-2', $object);
-
- $check = [
- [
- '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),
- 'calendardata' => $object,
- 'lastmodified' => null,
- ],
- ];
-
- $result = $backend->getMultipleCalendarObjects($returnedId, ['id-1', 'id-2']);
-
- foreach ($check as $index => $props) {
-
- foreach ($props as $key => $expected) {
-
- $actual = $result[$index][$key];
-
- switch ($key) {
- case 'lastmodified' :
- $this->assertInternalType('int', $actual);
- break;
- case 'calendardata' :
- if (is_resource($actual)) {
- $actual = stream_get_contents($actual);
- }
- // no break intentional
- default :
- $this->assertEquals($expected, $actual);
-
- }
-
- }
-
- }
-
- }
-
- /**
- * @depends testGetMultipleObjects
- * @expectedException \InvalidArgumentException
- */
- function testGetMultipleObjectsBadId() {
-
- $backend = new PDO($this->pdo);
- $backend->getMultipleCalendarObjects('bad-id', ['foo-bar']);
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\BadRequest
- * @depends testCreateCalendarObject
- */
- function testCreateCalendarObjectNoComponent() {
-
- $backend = new PDO($this->pdo);
- $returnedId = $backend->createCalendar('principals/user2', 'somerandomid', []);
-
- $object = "BEGIN:VCALENDAR\r\nBEGIN:VTIMEZONE\r\nEND:VTIMEZONE\r\nEND:VCALENDAR\r\n";
-
- $backend->createCalendarObject($returnedId, 'random-id', $object);
-
- }
-
- /**
- * @depends testCreateCalendarObject
- */
- function testCreateCalendarObjectDuration() {
-
- $backend = new PDO($this->pdo);
- $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\'');
-
- $row = $result->fetch(\PDO::FETCH_ASSOC);
- if (is_resource($row['calendardata'])) {
- $row['calendardata'] = stream_get_contents($row['calendardata']);
- }
-
- $this->assertEquals([
- 'etag' => md5($object),
- 'size' => strlen($object),
- 'calendardata' => $object,
- 'firstoccurence' => strtotime('20120101'),
- 'lastoccurence' => strtotime('20120101') + (3600 * 48),
- 'componenttype' => 'VEVENT',
- ], $row);
-
- }
-
- /**
- * @depends testCreateCalendarObject
- * @expectedException \InvalidArgumentException
- */
- function testCreateCalendarObjectBadId() {
-
- $backend = new PDO($this->pdo);
- $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('bad-id', 'random-id', $object);
-
- }
-
-
- /**
- * @depends testCreateCalendarObject
- */
- function testCreateCalendarObjectNoDTEND() {
-
- $backend = new PDO($this->pdo);
- $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\'');
- $row = $result->fetch(\PDO::FETCH_ASSOC);
- if (is_resource($row['calendardata'])) {
- $row['calendardata'] = stream_get_contents($row['calendardata']);
- }
-
- $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',
- ], $row);
-
- }
-
- /**
- * @depends testCreateCalendarObject
- */
- function testCreateCalendarObjectWithDTEND() {
-
- $backend = new PDO($this->pdo);
- $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\'');
- $row = $result->fetch(\PDO::FETCH_ASSOC);
- if (is_resource($row['calendardata'])) {
- $row['calendardata'] = stream_get_contents($row['calendardata']);
- }
-
- $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',
- ], $row);
-
- }
-
- /**
- * @depends testCreateCalendarObject
- */
- function testCreateCalendarObjectInfiniteRecurrence() {
-
- $backend = new PDO($this->pdo);
- $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\'');
- $row = $result->fetch(\PDO::FETCH_ASSOC);
- if (is_resource($row['calendardata'])) {
- $row['calendardata'] = stream_get_contents($row['calendardata']);
- }
-
- $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',
- ], $row);
-
- }
-
- /**
- * @depends testCreateCalendarObject
- */
- function testCreateCalendarObjectEndingRecurrence() {
-
- $backend = new PDO($this->pdo);
- $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\'');
- $row = $result->fetch(\PDO::FETCH_ASSOC);
- if (is_resource($row['calendardata'])) {
- $row['calendardata'] = stream_get_contents($row['calendardata']);
- }
-
- $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',
- ], $row);
-
- }
-
- /**
- * @depends testCreateCalendarObject
- */
- function testCreateCalendarObjectTask() {
-
- $backend = new PDO($this->pdo);
- $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\'');
- $row = $result->fetch(\PDO::FETCH_ASSOC);
- if (is_resource($row['calendardata'])) {
- $row['calendardata'] = stream_get_contents($row['calendardata']);
- }
-
- $this->assertEquals([
- 'etag' => md5($object),
- 'size' => strlen($object),
- 'calendardata' => $object,
- 'firstoccurence' => null,
- 'lastoccurence' => null,
- 'componenttype' => 'VTODO',
- ], $row);
-
- }
-
- /**
- * @depends testCreateCalendarObject
- */
- function testGetCalendarObjects() {
-
- $backend = new PDO($this->pdo);
- $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);
-
- $this->assertEquals(1, count($data));
- $data = $data[0];
-
- $this->assertEquals('random-id', $data['uri']);
- $this->assertEquals(strlen($object), $data['size']);
-
- }
-
- /**
- * @depends testGetCalendarObjects
- * @expectedException \InvalidArgumentException
- */
- function testGetCalendarObjectsBadId() {
-
- $backend = new PDO($this->pdo);
- $backend->getCalendarObjects('bad-id');
-
- }
-
- /**
- * @depends testGetCalendarObjects
- * @expectedException \InvalidArgumentException
- */
- function testGetCalendarObjectBadId() {
-
- $backend = new PDO($this->pdo);
- $backend->getCalendarObject('bad-id', 'foo-bar');
-
- }
-
- /**
- * @depends testCreateCalendarObject
- */
- function testGetCalendarObjectByUID() {
-
- $backend = new PDO($this->pdo);
- $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);
-
- $this->assertNull(
- $backend->getCalendarObjectByUID('principals/user2', 'bar')
- );
- $this->assertEquals(
- 'somerandomid/random-id',
- $backend->getCalendarObjectByUID('principals/user2', 'foo')
- );
-
- }
-
- /**
- * @depends testCreateCalendarObject
- */
- function testUpdateCalendarObject() {
-
- $backend = new PDO($this->pdo);
- $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');
-
- if (is_resource($data['calendardata'])) {
- $data['calendardata'] = stream_get_contents($data['calendardata']);
- }
-
- $this->assertEquals($object2, $data['calendardata']);
- $this->assertEquals('random-id', $data['uri']);
-
-
- }
-
- /**
- * @depends testUpdateCalendarObject
- * @expectedException \InvalidArgumentException
- */
- function testUpdateCalendarObjectBadId() {
-
- $backend = new PDO($this->pdo);
- $backend->updateCalendarObject('bad-id', 'object-id', 'objectdata');
-
- }
-
- /**
- * @depends testCreateCalendarObject
- */
- function testDeleteCalendarObject() {
-
- $backend = new PDO($this->pdo);
- $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');
- $this->assertNull($data);
-
- }
-
- /**
- * @depends testDeleteCalendarObject
- * @expectedException \InvalidArgumentException
- */
- function testDeleteCalendarObjectBadId() {
-
- $backend = new PDO($this->pdo);
- $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('bad-id', 'random-id');
-
- }
-
- function testCalendarQueryNoResult() {
-
- $abstract = new PDO($this->pdo);
- $filters = [
- 'name' => 'VCALENDAR',
- 'comp-filters' => [
- [
- 'name' => 'VJOURNAL',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ],
- ],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
-
- $this->assertEquals([
- ], $abstract->calendarQuery([1, 1], $filters));
-
- }
-
- /**
- * @expectedException \InvalidArgumentException
- * @depends testCalendarQueryNoResult
- */
- function testCalendarQueryBadId() {
-
- $abstract = new PDO($this->pdo);
- $filters = [
- 'name' => 'VCALENDAR',
- 'comp-filters' => [
- [
- 'name' => 'VJOURNAL',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ],
- ],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
-
- $abstract->calendarQuery('bad-id', $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");
-
- $filters = [
- 'name' => 'VCALENDAR',
- 'comp-filters' => [
- [
- 'name' => 'VTODO',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ],
- ],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
-
- $this->assertEquals([
- "todo",
- ], $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 = [
- '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' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
-
- $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");
-
- $filters = [
- 'name' => 'VCALENDAR',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
-
- $result = $backend->calendarQuery([1, 1], $filters);
- $this->assertTrue(in_array('todo', $result));
- $this->assertTrue(in_array('event', $result));
-
- }
-
- 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");
-
- $filters = [
- 'name' => 'VCALENDAR',
- 'comp-filters' => [
- [
- 'name' => 'VEVENT',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => [
- 'start' => new \DateTime('20120103'),
- 'end' => new \DateTime('20120104'),
- ],
- ],
- ],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
-
- $this->assertEquals([
- "event2",
- ], $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");
-
- $filters = [
- 'name' => 'VCALENDAR',
- 'comp-filters' => [
- [
- 'name' => 'VEVENT',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => [
- 'start' => new \DateTime('20120102'),
- 'end' => null,
- ],
- ],
- ],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
-
- $this->assertEquals([
- "event2",
- ], $backend->calendarQuery([1, 1], $filters));
-
- }
-
- function testGetChanges() {
-
- $backend = new PDO($this->pdo);
- $id = $backend->createCalendar(
- 'principals/user1',
- 'bla',
- []
- );
- $result = $backend->getChangesForCalendar($id, null, 1);
-
- $this->assertEquals([
- 'syncToken' => 1,
- 'modified' => [],
- 'deleted' => [],
- 'added' => [],
- ], $result);
-
- $currentToken = $result['syncToken'];
-
- $dummyTodo = "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n";
-
- $backend->createCalendarObject($id, "todo1.ics", $dummyTodo);
- $backend->createCalendarObject($id, "todo2.ics", $dummyTodo);
- $backend->createCalendarObject($id, "todo3.ics", $dummyTodo);
- $backend->updateCalendarObject($id, "todo1.ics", $dummyTodo);
- $backend->deleteCalendarObject($id, "todo2.ics");
-
- $result = $backend->getChangesForCalendar($id, $currentToken, 1);
-
- $this->assertEquals([
- 'syncToken' => 6,
- 'modified' => ["todo1.ics"],
- 'deleted' => ["todo2.ics"],
- 'added' => ["todo3.ics"],
- ], $result);
-
- $result = $backend->getChangesForCalendar($id, null, 1);
-
- $this->assertEquals([
- 'syncToken' => 6,
- 'modified' => [],
- 'deleted' => [],
- 'added' => ["todo1.ics", "todo3.ics"],
- ], $result);
- }
-
- /**
- * @depends testGetChanges
- * @expectedException \InvalidArgumentException
- */
- function testGetChangesBadId() {
-
- $backend = new PDO($this->pdo);
- $id = $backend->createCalendar(
- 'principals/user1',
- 'bla',
- []
- );
- $backend->getChangesForCalendar('bad-id', null, 1);
-
- }
-
- 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/}subscribed-strip-todos' => true,
- //'{http://calendarserver.org/ns/}subscribed-strip-alarms' => true,
- '{http://calendarserver.org/ns/}subscribed-strip-attachments' => true,
- ];
-
- $backend = new PDO($this->pdo);
- $backend->createSubscription('principals/user1', 'sub1', $props);
-
- $subs = $backend->getSubscriptionsForUser('principals/user1');
-
- $expected = $props;
- $expected['id'] = 1;
- $expected['uri'] = 'sub1';
- $expected['principaluri'] = 'principals/user1';
-
- unset($expected['{http://calendarserver.org/ns/}source']);
- $expected['source'] = 'http://example.org/cal.ics';
-
- $this->assertEquals(1, count($subs));
- foreach ($expected as $k => $v) {
- $this->assertEquals($subs[0][$k], $expected[$k]);
- }
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\Forbidden
- */
- function testCreateSubscriptionFail() {
-
- $props = [
- ];
-
- $backend = new PDO($this->pdo);
- $backend->createSubscription('principals/user1', 'sub1', $props);
-
- }
-
- 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/}subscribed-strip-todos' => true,
- //'{http://calendarserver.org/ns/}subscribed-strip-alarms' => true,
- '{http://calendarserver.org/ns/}subscribed-strip-attachments' => true,
- ];
-
- $backend = new PDO($this->pdo);
- $backend->createSubscription('principals/user1', 'sub1', $props);
-
- $newProps = [
- '{DAV:}displayname' => 'new displayname',
- '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics', false),
- ];
-
- $propPatch = new DAV\PropPatch($newProps);
- $backend->updateSubscription(1, $propPatch);
- $result = $propPatch->commit();
-
- $this->assertTrue($result);
-
- $subs = $backend->getSubscriptionsForUser('principals/user1');
-
- $expected = array_merge($props, $newProps);
- $expected['id'] = 1;
- $expected['uri'] = 'sub1';
- $expected['principaluri'] = 'principals/user1';
-
- unset($expected['{http://calendarserver.org/ns/}source']);
- $expected['source'] = 'http://example.org/cal2.ics';
-
- $this->assertEquals(1, count($subs));
- foreach ($expected as $k => $v) {
- $this->assertEquals($subs[0][$k], $expected[$k]);
- }
-
- }
-
- 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/}subscribed-strip-todos' => true,
- //'{http://calendarserver.org/ns/}subscribed-strip-alarms' => true,
- '{http://calendarserver.org/ns/}subscribed-strip-attachments' => true,
- ];
-
- $backend = new PDO($this->pdo);
- $backend->createSubscription('principals/user1', 'sub1', $props);
-
- $propPatch = new DAV\PropPatch([
- '{DAV:}displayname' => 'new displayname',
- '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics', false),
- '{DAV:}unknown' => 'foo',
- ]);
-
- $backend->updateSubscription(1, $propPatch);
- $propPatch->commit();
-
- $this->assertEquals([
- '{DAV:}unknown' => 403,
- '{DAV:}displayname' => 424,
- '{http://calendarserver.org/ns/}source' => 424,
- ], $propPatch->getResult());
-
- }
-
- 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/}subscribed-strip-todos' => true,
- //'{http://calendarserver.org/ns/}subscribed-strip-alarms' => true,
- '{http://calendarserver.org/ns/}subscribed-strip-attachments' => true,
- ];
-
- $backend = new PDO($this->pdo);
- $backend->createSubscription('principals/user1', 'sub1', $props);
-
- $newProps = [
- '{DAV:}displayname' => 'new displayname',
- '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/cal2.ics', false),
- ];
-
- $backend->deleteSubscription(1);
-
- $subs = $backend->getSubscriptionsForUser('principals/user1');
- $this->assertEquals(0, count($subs));
- }
-
- function testSchedulingMethods() {
-
- $backend = new PDO($this->pdo);
-
- $calData = "BEGIN:VCALENDAR\r\nEND:VCALENDAR\r\n";
-
- $backend->createSchedulingObject(
- 'principals/user1',
- 'schedule1.ics',
- $calData
- );
-
- $expected = [
- 'calendardata' => $calData,
- 'uri' => 'schedule1.ics',
- 'etag' => '"' . md5($calData) . '"',
- 'size' => strlen($calData)
- ];
-
- $result = $backend->getSchedulingObject('principals/user1', 'schedule1.ics');
- foreach ($expected as $k => $v) {
- $this->assertArrayHasKey($k, $result);
- if (is_resource($result[$k])) {
- $result[$k] = stream_get_contents($result[$k]);
- }
- $this->assertEquals($v, $result[$k]);
- }
-
- $results = $backend->getSchedulingObjects('principals/user1');
-
- $this->assertEquals(1, count($results));
- $result = $results[0];
- foreach ($expected as $k => $v) {
- if (is_resource($result[$k])) {
- $result[$k] = stream_get_contents($result[$k]);
- }
- $this->assertEquals($v, $result[$k]);
- }
-
- $backend->deleteSchedulingObject('principals/user1', 'schedule1.ics');
- $result = $backend->getSchedulingObject('principals/user1', 'schedule1.ics');
-
- $this->assertNull($result);
-
- }
-
- function testGetInvites() {
-
- $backend = new PDO($this->pdo);
-
- // creating a new calendar
- $backend->createCalendar('principals/user1', 'somerandomid', []);
- $calendar = $backend->getCalendarsForUser('principals/user1')[0];
-
- $result = $backend->getInvites($calendar['id']);
- $expected = [
- new Sharee([
- 'href' => 'principals/user1',
- 'principal' => 'principals/user1',
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER,
- 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
- ])
- ];
-
- $this->assertEquals($expected, $result);
-
- }
-
- /**
- * @depends testGetInvites
- * @expectedException \InvalidArgumentException
- */
- function testGetInvitesBadId() {
-
- $backend = new PDO($this->pdo);
-
- // creating a new calendar
- $backend->createCalendar('principals/user1', 'somerandomid', []);
- $calendar = $backend->getCalendarsForUser('principals/user1')[0];
-
- $backend->getInvites('bad-id');
-
- }
-
- /**
- * @depends testCreateCalendarAndFetch
- */
- function testUpdateInvites() {
-
- $backend = new PDO($this->pdo);
-
- // creating a new calendar
- $backend->createCalendar('principals/user1', 'somerandomid', []);
- $calendar = $backend->getCalendarsForUser('principals/user1')[0];
-
- $ownerSharee = new Sharee([
- 'href' => 'principals/user1',
- 'principal' => 'principals/user1',
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER,
- 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
- ]);
-
- // Add a new invite
- $backend->updateInvites(
- $calendar['id'],
- [
- new Sharee([
- 'href' => 'mailto:user@example.org',
- 'principal' => 'principals/user2',
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READ,
- 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
- 'properties' => ['{DAV:}displayname' => 'User 2'],
- ])
- ]
- );
-
- $result = $backend->getInvites($calendar['id']);
- $expected = [
- $ownerSharee,
- new Sharee([
- 'href' => 'mailto:user@example.org',
- 'principal' => 'principals/user2',
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READ,
- 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
- 'properties' => [
- '{DAV:}displayname' => 'User 2',
- ],
- ])
- ];
- $this->assertEquals($expected, $result);
-
- // Checking calendar_instances too
- $expectedCalendar = [
- 'id' => [1,2],
- 'principaluri' => 'principals/user2',
- '{http://calendarserver.org/ns/}getctag' => 'http://sabre.io/ns/sync/1',
- '{http://sabredav.org/ns}sync-token' => '1',
- 'share-access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READ,
- 'read-only' => true,
- 'share-resource-uri' => '/ns/share/1',
- ];
- $calendars = $backend->getCalendarsForUser('principals/user2');
-
- foreach ($expectedCalendar as $k => $v) {
- $this->assertEquals(
- $v,
- $calendars[0][$k],
- "Key " . $k . " in calendars array did not have the expected value."
- );
- }
-
-
- // Updating an invite
- $backend->updateInvites(
- $calendar['id'],
- [
- new Sharee([
- 'href' => 'mailto:user@example.org',
- 'principal' => 'principals/user2',
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READWRITE,
- 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
- ])
- ]
- );
-
- $result = $backend->getInvites($calendar['id']);
- $expected = [
- $ownerSharee,
- new Sharee([
- 'href' => 'mailto:user@example.org',
- 'principal' => 'principals/user2',
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READWRITE,
- 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
- 'properties' => [
- '{DAV:}displayname' => 'User 2',
- ],
- ])
- ];
- $this->assertEquals($expected, $result);
-
- // Removing an invite
- $backend->updateInvites(
- $calendar['id'],
- [
- new Sharee([
- 'href' => 'mailto:user@example.org',
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_NOACCESS,
- ])
- ]
- );
-
- $result = $backend->getInvites($calendar['id']);
- $expected = [
- $ownerSharee
- ];
- $this->assertEquals($expected, $result);
-
- // Preventing the owner share from being removed
- $backend->updateInvites(
- $calendar['id'],
- [
- new Sharee([
- 'href' => 'principals/user2',
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_NOACCESS,
- ])
- ]
- );
-
- $result = $backend->getInvites($calendar['id']);
- $expected = [
- new Sharee([
- 'href' => 'principals/user1',
- 'principal' => 'principals/user1',
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER,
- 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
- ]),
- ];
- $this->assertEquals($expected, $result);
-
- }
-
- /**
- * @depends testUpdateInvites
- * @expectedException \InvalidArgumentException
- */
- function testUpdateInvitesBadId() {
-
- $backend = new PDO($this->pdo);
- // Add a new invite
- $backend->updateInvites(
- 'bad-id',
- []
- );
-
- }
-
- /**
- * @depends testUpdateInvites
- */
- function testUpdateInvitesNoPrincipal() {
-
- $backend = new PDO($this->pdo);
-
- // creating a new calendar
- $backend->createCalendar('principals/user1', 'somerandomid', []);
- $calendar = $backend->getCalendarsForUser('principals/user1')[0];
-
- $ownerSharee = new Sharee([
- 'href' => 'principals/user1',
- 'principal' => 'principals/user1',
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER,
- 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
- ]);
-
- // Add a new invite
- $backend->updateInvites(
- $calendar['id'],
- [
- new Sharee([
- 'href' => 'mailto:user@example.org',
- 'principal' => null,
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READ,
- 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
- 'properties' => ['{DAV:}displayname' => 'User 2'],
- ])
- ]
- );
-
- $result = $backend->getInvites($calendar['id']);
- $expected = [
- $ownerSharee,
- new Sharee([
- 'href' => 'mailto:user@example.org',
- 'principal' => null,
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READ,
- 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_INVALID,
- 'properties' => [
- '{DAV:}displayname' => 'User 2',
- ],
- ])
- ];
- $this->assertEquals($expected, $result, null, 0.0, 10, true); // Last argument is $canonicalize = true, which allows us to compare, ignoring the order, because it's different between MySQL and Sqlite.
-
- }
-
- /**
- * @depends testUpdateInvites
- */
- function testDeleteSharedCalendar() {
-
- $backend = new PDO($this->pdo);
-
- // creating a new calendar
- $backend->createCalendar('principals/user1', 'somerandomid', []);
- $calendar = $backend->getCalendarsForUser('principals/user1')[0];
-
- $ownerSharee = new Sharee([
- 'href' => 'principals/user1',
- 'principal' => 'principals/user1',
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER,
- 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
- ]);
-
- // Add a new invite
- $backend->updateInvites(
- $calendar['id'],
- [
- new Sharee([
- 'href' => 'mailto:user@example.org',
- 'principal' => 'principals/user2',
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READ,
- 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
- 'properties' => ['{DAV:}displayname' => 'User 2'],
- ])
- ]
- );
-
- $expectedCalendar = [
- 'id' => [1,2],
- 'principaluri' => 'principals/user2',
- '{http://calendarserver.org/ns/}getctag' => 'http://sabre.io/ns/sync/1',
- '{http://sabredav.org/ns}sync-token' => '1',
- 'share-access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READ,
- 'read-only' => true,
- 'share-resource-uri' => '/ns/share/1',
- ];
- $calendars = $backend->getCalendarsForUser('principals/user2');
-
- foreach ($expectedCalendar as $k => $v) {
- $this->assertEquals(
- $v,
- $calendars[0][$k],
- "Key " . $k . " in calendars array did not have the expected value."
- );
- }
-
- // Removing the shared calendar.
- $backend->deleteCalendar($calendars[0]['id']);
-
- $this->assertEquals(
- [],
- $backend->getCalendarsForUser('principals/user2')
- );
-
- $result = $backend->getInvites($calendar['id']);
- $expected = [
- new Sharee([
- 'href' => 'principals/user1',
- 'principal' => 'principals/user1',
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER,
- 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_ACCEPTED,
- ]),
- ];
- $this->assertEquals($expected, $result);
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\NotImplemented
- */
- function testSetPublishStatus() {
-
- $backend = new PDO($this->pdo);
- $backend->setPublishStatus([1, 1], true);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/AbstractTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/AbstractTest.php
deleted file mode 100644
index 7f642efc9ae..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/AbstractTest.php
+++ /dev/null
@@ -1,178 +0,0 @@
- 'anything']);
-
- $abstract->updateCalendar('randomid', $propPatch);
- $result = $propPatch->commit();
-
- $this->assertFalse($result);
-
- }
-
- function testCalendarQuery() {
-
- $abstract = new AbstractMock();
- $filters = [
- 'name' => 'VCALENDAR',
- 'comp-filters' => [
- [
- 'name' => 'VEVENT',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ],
- ],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
-
- $this->assertEquals([
- 'event1.ics',
- ], $abstract->calendarQuery(1, $filters));
-
- }
-
- function testGetCalendarObjectByUID() {
-
- $abstract = new AbstractMock();
- $this->assertNull(
- $abstract->getCalendarObjectByUID('principal1', 'zim')
- );
- $this->assertEquals(
- 'cal1/event1.ics',
- $abstract->getCalendarObjectByUID('principal1', 'foo')
- );
- $this->assertNull(
- $abstract->getCalendarObjectByUID('principal3', 'foo')
- );
- $this->assertNull(
- $abstract->getCalendarObjectByUID('principal1', 'shared')
- );
-
- }
-
- function testGetMultipleCalendarObjects() {
-
- $abstract = new AbstractMock();
- $result = $abstract->getMultipleCalendarObjects(1, [
- 'event1.ics',
- 'task1.ics',
- ]);
-
- $expected = [
- [
- 'id' => 1,
- 'calendarid' => 1,
- 'uri' => 'event1.ics',
- 'calendardata' => "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nUID:foo\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n",
- ],
- [
- 'id' => 2,
- 'calendarid' => 1,
- 'uri' => 'task1.ics',
- 'calendardata' => "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n",
- ],
- ];
-
- $this->assertEquals($expected, $result);
-
-
- }
-
-}
-
-class AbstractMock extends AbstractBackend {
-
- function getCalendarsForUser($principalUri) {
-
- return [
- [
- 'id' => 1,
- 'principaluri' => 'principal1',
- 'uri' => 'cal1',
- ],
- [
- 'id' => 2,
- 'principaluri' => 'principal1',
- '{http://sabredav.org/ns}owner-principal' => 'principal2',
- 'uri' => 'cal1',
- ],
- ];
-
- }
- function createCalendar($principalUri, $calendarUri, array $properties) { }
- function deleteCalendar($calendarId) { }
- function getCalendarObjects($calendarId) {
-
- switch ($calendarId) {
- case 1:
- return [
- [
- 'id' => 1,
- 'calendarid' => 1,
- 'uri' => 'event1.ics',
- ],
- [
- 'id' => 2,
- 'calendarid' => 1,
- 'uri' => 'task1.ics',
- ],
- ];
- case 2:
- return [
- [
- 'id' => 3,
- 'calendarid' => 2,
- 'uri' => 'shared-event.ics',
- ]
- ];
- }
-
- }
-
- function getCalendarObject($calendarId, $objectUri) {
-
- switch ($objectUri) {
-
- case 'event1.ics' :
- return [
- 'id' => 1,
- 'calendarid' => 1,
- 'uri' => 'event1.ics',
- 'calendardata' => "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nUID:foo\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n",
- ];
- case 'task1.ics' :
- return [
- 'id' => 2,
- 'calendarid' => 1,
- 'uri' => 'task1.ics',
- 'calendardata' => "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n",
- ];
- case 'shared-event.ics' :
- return [
- 'id' => 3,
- 'calendarid' => 2,
- 'uri' => 'event1.ics',
- 'calendardata' => "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nUID:shared\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n",
- ];
-
- }
-
- }
- function createCalendarObject($calendarId, $objectUri, $calendarData) { }
- function updateCalendarObject($calendarId, $objectUri, $calendarData) { }
- function deleteCalendarObject($calendarId, $objectUri) { }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/Mock.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/Mock.php
deleted file mode 100644
index cc665cd8fa3..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/Mock.php
+++ /dev/null
@@ -1,258 +0,0 @@
-calendars = $calendars;
- $this->calendarData = $calendarData;
-
- }
-
- /**
- * Returns a list of calendars for a principal.
- *
- * Every project is an array with the following keys:
- * * id, a unique id that will be used by other functions to modify the
- * calendar. This can be the same as the uri or a database key.
- * * uri, which the basename of the uri with which the calendar is
- * accessed.
- * * principalUri. The owner of the calendar. Almost always the same as
- * principalUri passed to this method.
- *
- * Furthermore it can contain webdav properties in clark notation. A very
- * common one is '{DAV:}displayname'.
- *
- * @param string $principalUri
- * @return array
- */
- function getCalendarsForUser($principalUri) {
-
- $r = [];
- foreach ($this->calendars as $row) {
- if ($row['principaluri'] == $principalUri) {
- $r[] = $row;
- }
- }
-
- return $r;
-
- }
-
- /**
- * Creates a new calendar for a principal.
- *
- * If the creation was a success, an id must be returned that can be used to reference
- * this calendar in other methods, such as updateCalendar.
- *
- * This function must return a server-wide unique id that can be used
- * later to reference the calendar.
- *
- * @param string $principalUri
- * @param string $calendarUri
- * @param array $properties
- * @return string|int
- */
- function createCalendar($principalUri, $calendarUri, array $properties) {
-
- $id = DAV\UUIDUtil::getUUID();
- $this->calendars[] = array_merge([
- 'id' => $id,
- 'principaluri' => $principalUri,
- 'uri' => $calendarUri,
- '{' . CalDAV\Plugin::NS_CALDAV . '}supported-calendar-component-set' => new CalDAV\Xml\Property\SupportedCalendarComponentSet(['VEVENT', 'VTODO']),
- ], $properties);
-
- return $id;
-
- }
-
- /**
- * Updates properties for a calendar.
- *
- * The list of mutations is stored in a Sabre\DAV\PropPatch object.
- * To do the actual updates, you must tell this object which properties
- * you're going to process with the handle() method.
- *
- * Calling the handle method is like telling the PropPatch object "I
- * promise I can handle updating this property".
- *
- * Read the PropPatch documentation for more info and examples.
- *
- * @param mixed $calendarId
- * @param \Sabre\DAV\PropPatch $propPatch
- * @return void
- */
- function updateCalendar($calendarId, \Sabre\DAV\PropPatch $propPatch) {
-
- $propPatch->handleRemaining(function($props) use ($calendarId) {
-
- foreach ($this->calendars as $k => $calendar) {
-
- if ($calendar['id'] === $calendarId) {
- foreach ($props as $propName => $propValue) {
- if (is_null($propValue)) {
- unset($this->calendars[$k][$propName]);
- } else {
- $this->calendars[$k][$propName] = $propValue;
- }
- }
- return true;
-
- }
-
- }
-
- });
-
- }
-
- /**
- * Delete a calendar and all it's objects
- *
- * @param string $calendarId
- * @return void
- */
- function deleteCalendar($calendarId) {
-
- foreach ($this->calendars as $k => $calendar) {
- if ($calendar['id'] === $calendarId) {
- unset($this->calendars[$k]);
- }
- }
-
- }
-
- /**
- * Returns all calendar objects within a calendar object.
- *
- * Every item contains an array with the following keys:
- * * id - unique identifier which will be used for subsequent updates
- * * calendardata - The iCalendar-compatible calendar data
- * * uri - a unique key which will be used to construct the uri. This can be any arbitrary string.
- * * lastmodified - a timestamp of the last modification time
- * * etag - An arbitrary string, surrounded by double-quotes. (e.g.:
- * ' "abcdef"')
- * * calendarid - The calendarid as it was passed to this function.
- *
- * Note that the etag is optional, but it's highly encouraged to return for
- * speed reasons.
- *
- * The calendardata is also optional. If it's not returned
- * 'getCalendarObject' will be called later, which *is* expected to return
- * calendardata.
- *
- * @param string $calendarId
- * @return array
- */
- function getCalendarObjects($calendarId) {
-
- if (!isset($this->calendarData[$calendarId]))
- return [];
-
- $objects = $this->calendarData[$calendarId];
-
- foreach ($objects as $uri => &$object) {
- $object['calendarid'] = $calendarId;
- $object['uri'] = $uri;
- $object['lastmodified'] = null;
- }
- return $objects;
-
- }
-
- /**
- * Returns information from a single calendar object, based on it's object
- * uri.
- *
- * The object uri is only the basename, or filename and not a full path.
- *
- * The returned array must have the same keys as getCalendarObjects. The
- * 'calendardata' object is required here though, while it's not required
- * for getCalendarObjects.
- *
- * This method must return null if the object did not exist.
- *
- * @param mixed $calendarId
- * @param string $objectUri
- * @return array|null
- */
- function getCalendarObject($calendarId, $objectUri) {
-
- if (!isset($this->calendarData[$calendarId][$objectUri])) {
- return null;
- }
- $object = $this->calendarData[$calendarId][$objectUri];
- $object['calendarid'] = $calendarId;
- $object['uri'] = $objectUri;
- $object['lastmodified'] = null;
- return $object;
-
- }
-
- /**
- * Creates a new calendar object.
- *
- * @param string $calendarId
- * @param string $objectUri
- * @param string $calendarData
- * @return void
- */
- function createCalendarObject($calendarId, $objectUri, $calendarData) {
-
- $this->calendarData[$calendarId][$objectUri] = [
- 'calendardata' => $calendarData,
- 'calendarid' => $calendarId,
- 'uri' => $objectUri,
- ];
- return '"' . md5($calendarData) . '"';
-
- }
-
- /**
- * Updates an existing calendarobject, based on it's uri.
- *
- * @param string $calendarId
- * @param string $objectUri
- * @param string $calendarData
- * @return void
- */
- function updateCalendarObject($calendarId, $objectUri, $calendarData) {
-
- $this->calendarData[$calendarId][$objectUri] = [
- 'calendardata' => $calendarData,
- 'calendarid' => $calendarId,
- 'uri' => $objectUri,
- ];
- return '"' . md5($calendarData) . '"';
-
- }
-
- /**
- * Deletes an existing calendar object.
- *
- * @param string $calendarId
- * @param string $objectUri
- * @return void
- */
- function deleteCalendarObject($calendarId, $objectUri) {
-
- unset($this->calendarData[$calendarId][$objectUri]);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/MockScheduling.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/MockScheduling.php
deleted file mode 100644
index 3ac22f474f6..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/MockScheduling.php
+++ /dev/null
@@ -1,91 +0,0 @@
-schedulingObjects[$principalUri][$objectUri])) {
- return $this->schedulingObjects[$principalUri][$objectUri];
- }
-
- }
-
- /**
- * Returns all scheduling objects for the inbox collection.
- *
- * These objects should be returned as an array. Every item in the array
- * should follow the same structure as returned from getSchedulingObject.
- *
- * The main difference is that 'calendardata' is optional.
- *
- * @param string $principalUri
- * @return array
- */
- function getSchedulingObjects($principalUri) {
-
- if (isset($this->schedulingObjects[$principalUri])) {
- return array_values($this->schedulingObjects[$principalUri]);
- }
- return [];
-
- }
-
- /**
- * Deletes a scheduling object
- *
- * @param string $principalUri
- * @param string $objectUri
- * @return void
- */
- function deleteSchedulingObject($principalUri, $objectUri) {
-
- if (isset($this->schedulingObjects[$principalUri][$objectUri])) {
- unset($this->schedulingObjects[$principalUri][$objectUri]);
- }
-
- }
-
- /**
- * Creates a new scheduling object. This should land in a users' inbox.
- *
- * @param string $principalUri
- * @param string $objectUri
- * @param string $objectData;
- * @return void
- */
- function createSchedulingObject($principalUri, $objectUri, $objectData) {
-
- if (!isset($this->schedulingObjects[$principalUri])) {
- $this->schedulingObjects[$principalUri] = [];
- }
- $this->schedulingObjects[$principalUri][$objectUri] = [
- 'uri' => $objectUri,
- 'calendardata' => $objectData,
- 'lastmodified' => null,
- 'etag' => '"' . md5($objectData) . '"',
- 'size' => strlen($objectData)
- ];
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/MockSharing.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/MockSharing.php
deleted file mode 100644
index eaf52e32f4a..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/MockSharing.php
+++ /dev/null
@@ -1,204 +0,0 @@
-notifications = $notifications;
-
- }
-
- /**
- * Returns a list of calendars for a principal.
- *
- * Every project is an array with the following keys:
- * * id, a unique id that will be used by other functions to modify the
- * calendar. This can be the same as the uri or a database key.
- * * uri, which the basename of the uri with which the calendar is
- * accessed.
- * * principalUri. The owner of the calendar. Almost always the same as
- * principalUri passed to this method.
- *
- * Furthermore it can contain webdav properties in clark notation. A very
- * common one is '{DAV:}displayname'.
- *
- * @param string $principalUri
- * @return array
- */
- function getCalendarsForUser($principalUri) {
-
- $calendars = parent::getCalendarsForUser($principalUri);
- foreach ($calendars as $k => $calendar) {
-
- if (isset($calendar['share-access'])) {
- continue;
- }
- if (!empty($this->shares[$calendar['id']])) {
- $calendar['share-access'] = DAV\Sharing\Plugin::ACCESS_SHAREDOWNER;
- } else {
- $calendar['share-access'] = DAV\Sharing\Plugin::ACCESS_NOTSHARED;
- }
- $calendars[$k] = $calendar;
-
- }
- return $calendars;
-
- }
-
- /**
- * Returns a list of notifications for a given principal url.
- *
- * The returned array should only consist of implementations of
- * Sabre\CalDAV\Notifications\INotificationType.
- *
- * @param string $principalUri
- * @return array
- */
- function getNotificationsForPrincipal($principalUri) {
-
- if (isset($this->notifications[$principalUri])) {
- return $this->notifications[$principalUri];
- }
- return [];
-
- }
-
- /**
- * This deletes a specific notifcation.
- *
- * This may be called by a client once it deems a notification handled.
- *
- * @param string $principalUri
- * @param NotificationInterface $notification
- * @return void
- */
- function deleteNotification($principalUri, NotificationInterface $notification) {
-
- foreach ($this->notifications[$principalUri] as $key => $value) {
- if ($notification === $value) {
- unset($this->notifications[$principalUri][$key]);
- }
- }
-
- }
-
- /**
- * Updates the list of shares.
- *
- * @param mixed $calendarId
- * @param \Sabre\DAV\Xml\Element\Sharee[] $sharees
- * @return void
- */
- function updateInvites($calendarId, array $sharees) {
-
- if (!isset($this->shares[$calendarId])) {
- $this->shares[$calendarId] = [];
- }
-
- foreach ($sharees as $sharee) {
-
- $existingKey = null;
- foreach ($this->shares[$calendarId] as $k => $existingSharee) {
- if ($sharee->href === $existingSharee->href) {
- $existingKey = $k;
- }
- }
- // Just making sure we're not affecting an existing copy.
- $sharee = clone $sharee;
- $sharee->inviteStatus = DAV\Sharing\Plugin::INVITE_NORESPONSE;
-
- if ($sharee->access === DAV\Sharing\Plugin::ACCESS_NOACCESS) {
- // It's a removal
- unset($this->shares[$calendarId][$existingKey]);
- } elseif ($existingKey) {
- // It's an update
- $this->shares[$calendarId][$existingKey] = $sharee;
- } else {
- // It's an addition
- $this->shares[$calendarId][] = $sharee;
- }
- }
-
- // Re-numbering keys
- $this->shares[$calendarId] = array_values($this->shares[$calendarId]);
-
- }
-
- /**
- * Returns the list of people whom this calendar is shared with.
- *
- * Every item in the returned list must be a Sharee object with at
- * least the following properties set:
- * $href
- * $shareAccess
- * $inviteStatus
- *
- * and optionally:
- * $properties
- *
- * @param mixed $calendarId
- * @return \Sabre\DAV\Xml\Element\Sharee[]
- */
- function getInvites($calendarId) {
-
- if (!isset($this->shares[$calendarId])) {
- return [];
- }
-
- return $this->shares[$calendarId];
-
- }
-
- /**
- * This method is called when a user replied to a request to share.
- *
- * @param string href The sharee who is replying (often a mailto: address)
- * @param int status One of the \Sabre\DAV\Sharing\Plugin::INVITE_* constants
- * @param string $calendarUri The url to the calendar thats being shared
- * @param string $inReplyTo The unique id this message is a response to
- * @param string $summary A description of the reply
- * @return void
- */
- function shareReply($href, $status, $calendarUri, $inReplyTo, $summary = null) {
-
- // This operation basically doesn't do anything yet
- if ($status === DAV\Sharing\Plugin::INVITE_ACCEPTED) {
- return 'calendars/blabla/calendar';
- }
-
- }
-
- /**
- * Publishes a calendar
- *
- * @param mixed $calendarId
- * @param bool $value
- * @return void
- */
- function setPublishStatus($calendarId, $value) {
-
- foreach ($this->calendars as $k => $cal) {
- if ($cal['id'] === $calendarId) {
- if (!$value) {
- unset($cal['{http://calendarserver.org/ns/}publish-url']);
- } else {
- $cal['{http://calendarserver.org/ns/}publish-url'] = 'http://example.org/public/ ' . $calendarId . '.ics';
- }
- return;
- }
- }
-
- throw new DAV\Exception('Calendar with id "' . $calendarId . '" not found');
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/MockSubscriptionSupport.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/MockSubscriptionSupport.php
deleted file mode 100644
index adf9c8a17d6..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/MockSubscriptionSupport.php
+++ /dev/null
@@ -1,156 +0,0 @@
-subs[$principalUri])) {
- return $this->subs[$principalUri];
- }
- return [];
-
- }
-
- /**
- * Creates a new subscription for a principal.
- *
- * If the creation was a success, an id must be returned that can be used to reference
- * this subscription in other methods, such as updateSubscription.
- *
- * @param string $principalUri
- * @param string $uri
- * @param array $properties
- * @return mixed
- */
- function createSubscription($principalUri, $uri, array $properties) {
-
- $properties['uri'] = $uri;
- $properties['principaluri'] = $principalUri;
- $properties['source'] = $properties['{http://calendarserver.org/ns/}source']->getHref();
-
- if (!isset($this->subs[$principalUri])) {
- $this->subs[$principalUri] = [];
- }
-
- $id = [$principalUri, count($this->subs[$principalUri]) + 1];
-
- $properties['id'] = $id;
-
- $this->subs[$principalUri][] = array_merge($properties, [
- 'id' => $id,
- ]);
-
- return $id;
-
- }
-
- /**
- * Updates a subscription
- *
- * The list of mutations is stored in a Sabre\DAV\PropPatch object.
- * To do the actual updates, you must tell this object which properties
- * you're going to process with the handle() method.
- *
- * Calling the handle method is like telling the PropPatch object "I
- * promise I can handle updating this property".
- *
- * Read the PropPatch documentation for more info and examples.
- *
- * @param mixed $subscriptionId
- * @param \Sabre\DAV\PropPatch $propPatch
- * @return void
- */
- function updateSubscription($subscriptionId, DAV\PropPatch $propPatch) {
-
- $found = null;
- foreach ($this->subs[$subscriptionId[0]] as &$sub) {
-
- if ($sub['id'][1] === $subscriptionId[1]) {
- $found = & $sub;
- break;
- }
-
- }
-
- if (!$found) return;
-
- $propPatch->handleRemaining(function($mutations) use (&$found) {
- foreach ($mutations as $k => $v) {
- $found[$k] = $v;
- }
- return true;
- });
-
- }
-
- /**
- * Deletes a subscription
- *
- * @param mixed $subscriptionId
- * @return void
- */
- function deleteSubscription($subscriptionId) {
-
- foreach ($this->subs[$subscriptionId[0]] as $index => $sub) {
-
- if ($sub['id'][1] === $subscriptionId[1]) {
- unset($this->subs[$subscriptionId[0]][$index]);
- return true;
- }
-
- }
-
- return false;
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/PDOMySQLTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/PDOMySQLTest.php
deleted file mode 100644
index e068ff1e78f..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Backend/PDOMySQLTest.php
+++ /dev/null
@@ -1,9 +0,0 @@
-markTestSkipped('SQLite driver is not available');
-
- if (file_exists(SABRE_TEMPDIR . '/testdb.sqlite'))
- unlink(SABRE_TEMPDIR . '/testdb.sqlite');
-
- $pdo = new \PDO('sqlite:' . SABRE_TEMPDIR . '/testdb.sqlite');
- $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
-
- $pdo->exec(<<exec(<<pdo = $pdo;
-
- }
-
- function testConstruct() {
-
- $backend = new SimplePDO($this->pdo);
- $this->assertTrue($backend instanceof SimplePDO);
-
- }
-
- /**
- * @depends testConstruct
- */
- function testGetCalendarsForUserNoCalendars() {
-
- $backend = new SimplePDO($this->pdo);
- $calendars = $backend->getCalendarsForUser('principals/user2');
- $this->assertEquals([], $calendars);
-
- }
-
- /**
- * @depends testConstruct
- */
- function testCreateCalendarAndFetch() {
-
- $backend = new SimplePDO($this->pdo);
- $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 = [
- 'uri' => 'somerandomid',
- ];
-
- $this->assertInternalType('array', $calendars);
- $this->assertEquals(1, count($calendars));
-
- foreach ($elementCheck as $name => $value) {
-
- $this->assertArrayHasKey($name, $calendars[0]);
- $this->assertEquals($value, $calendars[0][$name]);
-
- }
-
- }
-
- /**
- * @depends testConstruct
- */
- function testUpdateCalendarAndFetch() {
-
- $backend = new SimplePDO($this->pdo);
-
- //Creating a new calendar
- $newId = $backend->createCalendar('principals/user2', 'somerandomid', []);
-
- $propPatch = new PropPatch([
- '{DAV:}displayname' => 'myCalendar',
- '{urn:ietf:params:xml:ns:caldav}schedule-calendar-transp' => new CalDAV\Xml\Property\ScheduleCalendarTransp('transparent'),
- ]);
-
- // Updating the calendar
- $backend->updateCalendar($newId, $propPatch);
- $result = $propPatch->commit();
-
- // Verifying the result of the update
- $this->assertFalse($result);
-
- }
-
- /**
- * @depends testCreateCalendarAndFetch
- */
- function testDeleteCalendar() {
-
- $backend = new SimplePDO($this->pdo);
- $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([], $calendars);
-
- }
-
- function testCreateCalendarObject() {
-
- $backend = new SimplePDO($this->pdo);
- $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 calendardata FROM simple_calendarobjects WHERE uri = "random-id"');
- $this->assertEquals([
- 'calendardata' => $object,
- ], $result->fetch(\PDO::FETCH_ASSOC));
-
- }
- function testGetMultipleObjects() {
-
- $backend = new SimplePDO($this->pdo);
- $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, 'id-1', $object);
- $backend->createCalendarObject($returnedId, 'id-2', $object);
-
- $check = [
- [
- 'id' => 1,
- 'etag' => '"' . md5($object) . '"',
- 'uri' => 'id-1',
- 'size' => strlen($object),
- 'calendardata' => $object,
- ],
- [
- 'id' => 2,
- 'etag' => '"' . md5($object) . '"',
- 'uri' => 'id-2',
- 'size' => strlen($object),
- 'calendardata' => $object,
- ],
- ];
-
- $result = $backend->getMultipleCalendarObjects($returnedId, ['id-1', 'id-2']);
-
- foreach ($check as $index => $props) {
-
- foreach ($props as $key => $value) {
-
- if ($key !== 'lastmodified') {
- $this->assertEquals($value, $result[$index][$key]);
- } else {
- $this->assertTrue(isset($result[$index][$key]));
- }
-
- }
-
- }
-
- }
-
- /**
- * @depends testCreateCalendarObject
- */
- function testGetCalendarObjects() {
-
- $backend = new SimplePDO($this->pdo);
- $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);
-
- $this->assertEquals(1, count($data));
- $data = $data[0];
-
- $this->assertEquals('random-id', $data['uri']);
- $this->assertEquals(strlen($object), $data['size']);
-
- }
-
- /**
- * @depends testCreateCalendarObject
- */
- function testGetCalendarObjectByUID() {
-
- $backend = new SimplePDO($this->pdo);
- $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);
-
- $this->assertNull(
- $backend->getCalendarObjectByUID('principals/user2', 'bar')
- );
- $this->assertEquals(
- 'somerandomid/random-id',
- $backend->getCalendarObjectByUID('principals/user2', 'foo')
- );
-
- }
-
- /**
- * @depends testCreateCalendarObject
- */
- function testUpdateCalendarObject() {
-
- $backend = new SimplePDO($this->pdo);
- $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');
-
- $this->assertEquals($object2, $data['calendardata']);
- $this->assertEquals('random-id', $data['uri']);
-
-
- }
-
-
- /**
- * @depends testCreateCalendarObject
- */
- function testDeleteCalendarObject() {
-
- $backend = new SimplePDO($this->pdo);
- $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');
- $this->assertNull($data);
-
- }
-
-
- function testCalendarQueryNoResult() {
-
- $abstract = new SimplePDO($this->pdo);
- $filters = [
- 'name' => 'VCALENDAR',
- 'comp-filters' => [
- [
- 'name' => 'VJOURNAL',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ],
- ],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
-
- $this->assertEquals([
- ], $abstract->calendarQuery(1, $filters));
-
- }
-
- function testCalendarQueryTodo() {
-
- $backend = new SimplePDO($this->pdo);
- $backend->createCalendarObject(1, "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
- $backend->createCalendarObject(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' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ],
- ],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
-
- $this->assertEquals([
- "todo",
- ], $backend->calendarQuery(1, $filters));
-
- }
- function testCalendarQueryTodoNotMatch() {
-
- $backend = new SimplePDO($this->pdo);
- $backend->createCalendarObject(1, "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
- $backend->createCalendarObject(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' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
-
- $this->assertEquals([
- ], $backend->calendarQuery(1, $filters));
-
- }
-
- function testCalendarQueryNoFilter() {
-
- $backend = new SimplePDO($this->pdo);
- $backend->createCalendarObject(1, "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
- $backend->createCalendarObject(1, "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
-
- $filters = [
- 'name' => 'VCALENDAR',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
-
- $result = $backend->calendarQuery(1, $filters);
- $this->assertTrue(in_array('todo', $result));
- $this->assertTrue(in_array('event', $result));
-
- }
-
- function testCalendarQueryTimeRange() {
-
- $backend = new SimplePDO($this->pdo);
- $backend->createCalendarObject(1, "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
- $backend->createCalendarObject(1, "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
- $backend->createCalendarObject(1, "event2", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART;VALUE=DATE:20120103\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
-
- $filters = [
- 'name' => 'VCALENDAR',
- 'comp-filters' => [
- [
- 'name' => 'VEVENT',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => [
- 'start' => new \DateTime('20120103'),
- 'end' => new \DateTime('20120104'),
- ],
- ],
- ],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
-
- $this->assertEquals([
- "event2",
- ], $backend->calendarQuery(1, $filters));
-
- }
- function testCalendarQueryTimeRangeNoEnd() {
-
- $backend = new SimplePDO($this->pdo);
- $backend->createCalendarObject(1, "todo", "BEGIN:VCALENDAR\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n");
- $backend->createCalendarObject(1, "event", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120101\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
- $backend->createCalendarObject(1, "event2", "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nDTSTART:20120103\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
-
- $filters = [
- 'name' => 'VCALENDAR',
- 'comp-filters' => [
- [
- 'name' => 'VEVENT',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => [
- 'start' => new \DateTime('20120102'),
- 'end' => null,
- ],
- ],
- ],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
-
- $this->assertEquals([
- "event2",
- ], $backend->calendarQuery(1, $filters));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarHomeNotificationsTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarHomeNotificationsTest.php
deleted file mode 100644
index 36302cc3556..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarHomeNotificationsTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
- 'principals/user']);
-
- $this->assertEquals(
- [],
- $calendarHome->getChildren()
- );
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\NotFound
- */
- function testGetChildNoSupport() {
-
- $backend = new Backend\Mock();
- $calendarHome = new CalendarHome($backend, ['uri' => 'principals/user']);
- $calendarHome->getChild('notifications');
-
- }
-
- function testGetChildren() {
-
- $backend = new Backend\MockSharing();
- $calendarHome = new CalendarHome($backend, ['uri' => 'principals/user']);
-
- $result = $calendarHome->getChildren();
- $this->assertEquals('notifications', $result[0]->getName());
-
- }
-
- function testGetChild() {
-
- $backend = new Backend\MockSharing();
- $calendarHome = new CalendarHome($backend, ['uri' => 'principals/user']);
- $result = $calendarHome->getChild('notifications');
- $this->assertEquals('notifications', $result->getName());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarHomeSharedCalendarsTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarHomeSharedCalendarsTest.php
deleted file mode 100644
index 9079fdecd80..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarHomeSharedCalendarsTest.php
+++ /dev/null
@@ -1,80 +0,0 @@
- 1,
- 'principaluri' => 'principals/user1',
- ],
- [
- 'id' => 2,
- '{http://calendarserver.org/ns/}shared-url' => 'calendars/owner/cal1',
- '{http://sabredav.org/ns}owner-principal' => 'principal/owner',
- '{http://sabredav.org/ns}read-only' => false,
- 'principaluri' => 'principals/user1',
- ],
- ];
-
- $this->backend = new Backend\MockSharing(
- $calendars,
- [],
- []
- );
-
- return new CalendarHome($this->backend, [
- 'uri' => 'principals/user1'
- ]);
-
- }
-
- function testSimple() {
-
- $instance = $this->getInstance();
- $this->assertEquals('user1', $instance->getName());
-
- }
-
- function testGetChildren() {
-
- $instance = $this->getInstance();
- $children = $instance->getChildren();
- $this->assertEquals(3, count($children));
-
- // Testing if we got all the objects back.
- $sharedCalendars = 0;
- $hasOutbox = false;
- $hasNotifications = false;
-
- foreach ($children as $child) {
-
- if ($child instanceof ISharedCalendar) {
- $sharedCalendars++;
- }
- if ($child instanceof Notifications\ICollection) {
- $hasNotifications = true;
- }
-
- }
- $this->assertEquals(2, $sharedCalendars);
- $this->assertTrue($hasNotifications);
-
- }
-
- function testShareReply() {
-
- $instance = $this->getInstance();
- $result = $instance->shareReply('uri', DAV\Sharing\Plugin::INVITE_DECLINED, 'curi', '1');
- $this->assertNull($result);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarHomeSubscriptionsTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarHomeSubscriptionsTest.php
deleted file mode 100644
index 4a479c81602..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarHomeSubscriptionsTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
- 'baz',
- '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/test.ics'),
- ];
- $principal = [
- 'uri' => 'principals/user1'
- ];
- $this->backend = new Backend\MockSubscriptionSupport([], []);
- $this->backend->createSubscription('principals/user1', 'uri', $props);
-
- return new CalendarHome($this->backend, $principal);
-
- }
-
- function testSimple() {
-
- $instance = $this->getInstance();
- $this->assertEquals('user1', $instance->getName());
-
- }
-
- function testGetChildren() {
-
- $instance = $this->getInstance();
- $children = $instance->getChildren();
- $this->assertEquals(1, count($children));
- foreach ($children as $child) {
- if ($child instanceof Subscriptions\Subscription) {
- return;
- }
- }
- $this->fail('There were no subscription nodes in the calendar home');
-
- }
-
- function testCreateSubscription() {
-
- $instance = $this->getInstance();
- $rt = ['{DAV:}collection', '{http://calendarserver.org/ns/}subscribed'];
-
- $props = [
- '{DAV:}displayname' => 'baz',
- '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/test2.ics'),
- ];
- $instance->createExtendedCollection('sub2', new MkCol($rt, $props));
-
- $children = $instance->getChildren();
- $this->assertEquals(2, count($children));
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\InvalidResourceType
- */
- function testNoSubscriptionSupport() {
-
- $principal = [
- 'uri' => 'principals/user1'
- ];
- $backend = new Backend\Mock([], []);
- $uC = new CalendarHome($backend, $principal);
-
- $rt = ['{DAV:}collection', '{http://calendarserver.org/ns/}subscribed'];
-
- $props = [
- '{DAV:}displayname' => 'baz',
- '{http://calendarserver.org/ns/}source' => new \Sabre\DAV\Xml\Property\Href('http://example.org/test2.ics'),
- ];
- $uC->createExtendedCollection('sub2', new MkCol($rt, $props));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarHomeTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarHomeTest.php
deleted file mode 100644
index ff52ea6ad20..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarHomeTest.php
+++ /dev/null
@@ -1,215 +0,0 @@
-backend = TestUtil::getBackend();
- $this->usercalendars = new CalendarHome($this->backend, [
- 'uri' => 'principals/user1'
- ]);
-
- }
-
- function testSimple() {
-
- $this->assertEquals('user1', $this->usercalendars->getName());
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\NotFound
- * @depends testSimple
- */
- function testGetChildNotFound() {
-
- $this->usercalendars->getChild('randomname');
-
- }
-
- function testChildExists() {
-
- $this->assertFalse($this->usercalendars->childExists('foo'));
- $this->assertTrue($this->usercalendars->childExists('UUID-123467'));
-
- }
-
- function testGetOwner() {
-
- $this->assertEquals('principals/user1', $this->usercalendars->getOwner());
-
- }
-
- function testGetGroup() {
-
- $this->assertNull($this->usercalendars->getGroup());
-
- }
-
- function testGetACL() {
-
- $expected = [
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user1',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}write',
- 'principal' => 'principals/user1',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user1/calendar-proxy-write',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}write',
- 'principal' => 'principals/user1/calendar-proxy-write',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user1/calendar-proxy-read',
- 'protected' => true,
- ],
- ];
- $this->assertEquals($expected, $this->usercalendars->getACL());
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\Forbidden
- */
- function testSetACL() {
-
- $this->usercalendars->setACL([]);
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\Forbidden
- * @depends testSimple
- */
- function testSetName() {
-
- $this->usercalendars->setName('bla');
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\Forbidden
- * @depends testSimple
- */
- function testDelete() {
-
- $this->usercalendars->delete();
-
- }
-
- /**
- * @depends testSimple
- */
- function testGetLastModified() {
-
- $this->assertNull($this->usercalendars->getLastModified());
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\MethodNotAllowed
- * @depends testSimple
- */
- function testCreateFile() {
-
- $this->usercalendars->createFile('bla');
-
- }
-
-
- /**
- * @expectedException Sabre\DAV\Exception\MethodNotAllowed
- * @depends testSimple
- */
- function testCreateDirectory() {
-
- $this->usercalendars->createDirectory('bla');
-
- }
-
- /**
- * @depends testSimple
- */
- function testCreateExtendedCollection() {
-
- $mkCol = new MkCol(
- ['{DAV:}collection', '{urn:ietf:params:xml:ns:caldav}calendar'],
- []
- );
- $result = $this->usercalendars->createExtendedCollection('newcalendar', $mkCol);
- $this->assertNull($result);
- $cals = $this->backend->getCalendarsForUser('principals/user1');
- $this->assertEquals(3, count($cals));
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\InvalidResourceType
- * @depends testSimple
- */
- function testCreateExtendedCollectionBadResourceType() {
-
- $mkCol = new MkCol(
- ['{DAV:}collection', '{DAV:}blabla'],
- []
- );
- $this->usercalendars->createExtendedCollection('newcalendar', $mkCol);
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\InvalidResourceType
- * @depends testSimple
- */
- function testCreateExtendedCollectionNotACalendar() {
-
- $mkCol = new MkCol(
- ['{DAV:}collection'],
- []
- );
- $this->usercalendars->createExtendedCollection('newcalendar', $mkCol);
-
- }
-
- function testGetSupportedPrivilegesSet() {
-
- $this->assertNull($this->usercalendars->getSupportedPrivilegeSet());
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\NotImplemented
- */
- function testShareReplyFail() {
-
- $this->usercalendars->shareReply('uri', DAV\Sharing\Plugin::INVITE_DECLINED, 'curi', '1');
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarObjectTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarObjectTest.php
deleted file mode 100644
index c92cde66133..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarObjectTest.php
+++ /dev/null
@@ -1,383 +0,0 @@
-backend = TestUtil::getBackend();
-
- $calendars = $this->backend->getCalendarsForUser('principals/user1');
- $this->assertEquals(2, count($calendars));
- $this->calendar = new Calendar($this->backend, $calendars[0]);
-
- }
-
- function teardown() {
-
- unset($this->calendar);
- unset($this->backend);
-
- }
-
- function testSetup() {
-
- $children = $this->calendar->getChildren();
- $this->assertTrue($children[0] instanceof CalendarObject);
-
- $this->assertInternalType('string', $children[0]->getName());
- $this->assertInternalType('string', $children[0]->get());
- $this->assertInternalType('string', $children[0]->getETag());
- $this->assertEquals('text/calendar; charset=utf-8', $children[0]->getContentType());
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testInvalidArg1() {
-
- $obj = new CalendarObject(
- new Backend\Mock([], []),
- [],
- []
- );
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testInvalidArg2() {
-
- $obj = new CalendarObject(
- new Backend\Mock([], []),
- [],
- ['calendarid' => '1']
- );
-
- }
-
- /**
- * @depends testSetup
- */
- function testPut() {
-
- $children = $this->calendar->getChildren();
- $this->assertTrue($children[0] instanceof CalendarObject);
- $newData = TestUtil::getTestCalendarData();
-
- $children[0]->put($newData);
- $this->assertEquals($newData, $children[0]->get());
-
- }
-
- /**
- * @depends testSetup
- */
- function testPutStream() {
-
- $children = $this->calendar->getChildren();
- $this->assertTrue($children[0] instanceof CalendarObject);
- $newData = TestUtil::getTestCalendarData();
-
- $stream = fopen('php://temp', 'r+');
- fwrite($stream, $newData);
- rewind($stream);
- $children[0]->put($stream);
- $this->assertEquals($newData, $children[0]->get());
-
- }
-
-
- /**
- * @depends testSetup
- */
- function testDelete() {
-
- $children = $this->calendar->getChildren();
- $this->assertTrue($children[0] instanceof CalendarObject);
-
- $obj = $children[0];
- $obj->delete();
-
- $children2 = $this->calendar->getChildren();
- $this->assertEquals(count($children) - 1, count($children2));
-
- }
-
- /**
- * @depends testSetup
- */
- function testGetLastModified() {
-
- $children = $this->calendar->getChildren();
- $this->assertTrue($children[0] instanceof CalendarObject);
-
- $obj = $children[0];
-
- $lastMod = $obj->getLastModified();
- $this->assertTrue(is_int($lastMod) || ctype_digit($lastMod) || is_null($lastMod));
-
- }
-
- /**
- * @depends testSetup
- */
- function testGetSize() {
-
- $children = $this->calendar->getChildren();
- $this->assertTrue($children[0] instanceof CalendarObject);
-
- $obj = $children[0];
-
- $size = $obj->getSize();
- $this->assertInternalType('int', $size);
-
- }
-
- function testGetOwner() {
-
- $children = $this->calendar->getChildren();
- $this->assertTrue($children[0] instanceof CalendarObject);
-
- $obj = $children[0];
- $this->assertEquals('principals/user1', $obj->getOwner());
-
- }
-
- function testGetGroup() {
-
- $children = $this->calendar->getChildren();
- $this->assertTrue($children[0] instanceof CalendarObject);
-
- $obj = $children[0];
- $this->assertNull($obj->getGroup());
-
- }
-
- function testGetACL() {
-
- $expected = [
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user1',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user1/calendar-proxy-write',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user1/calendar-proxy-read',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}write',
- 'principal' => 'principals/user1',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}write',
- 'principal' => 'principals/user1/calendar-proxy-write',
- 'protected' => true,
- ],
- ];
-
- $children = $this->calendar->getChildren();
- $this->assertTrue($children[0] instanceof CalendarObject);
-
- $obj = $children[0];
- $this->assertEquals($expected, $obj->getACL());
-
- }
-
- function testDefaultACL() {
-
- $backend = new Backend\Mock([], []);
- $calendarObject = new CalendarObject($backend, ['principaluri' => 'principals/user1'], ['calendarid' => 1, 'uri' => 'foo']);
- $expected = [
- [
- 'privilege' => '{DAV:}all',
- 'principal' => 'principals/user1',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}all',
- 'principal' => 'principals/user1/calendar-proxy-write',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user1/calendar-proxy-read',
- 'protected' => true,
- ],
- ];
- $this->assertEquals($expected, $calendarObject->getACL());
-
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\Forbidden
- */
- function testSetACL() {
-
- $children = $this->calendar->getChildren();
- $this->assertTrue($children[0] instanceof CalendarObject);
-
- $obj = $children[0];
- $obj->setACL([]);
-
- }
-
- function testGet() {
-
- $children = $this->calendar->getChildren();
- $this->assertTrue($children[0] instanceof CalendarObject);
-
- $obj = $children[0];
-
- $expected = "BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//iCal 4.0.1//EN
-CALSCALE:GREGORIAN
-BEGIN:VTIMEZONE
-TZID:Asia/Seoul
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0900
-RRULE:FREQ=YEARLY;UNTIL=19880507T150000Z;BYMONTH=5;BYDAY=2SU
-DTSTART:19870510T000000
-TZNAME:GMT+09:00
-TZOFFSETTO:+1000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1000
-DTSTART:19881009T000000
-TZNAME:GMT+09:00
-TZOFFSETTO:+0900
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-CREATED:20100225T154229Z
-UID:39A6B5ED-DD51-4AFE-A683-C35EE3749627
-TRANSP:TRANSPARENT
-SUMMARY:Something here
-DTSTAMP:20100228T130202Z
-DTSTART;TZID=Asia/Seoul:20100223T060000
-DTEND;TZID=Asia/Seoul:20100223T070000
-ATTENDEE;PARTSTAT=NEEDS-ACTION:mailto:lisa@example.com
-SEQUENCE:2
-END:VEVENT
-END:VCALENDAR";
-
-
-
- $this->assertEquals($expected, $obj->get());
-
- }
-
- function testGetRefetch() {
-
- $backend = new Backend\Mock([], [
- 1 => [
- 'foo' => [
- 'calendardata' => 'foo',
- 'uri' => 'foo'
- ],
- ]
- ]);
- $obj = new CalendarObject($backend, ['id' => 1], ['uri' => 'foo']);
-
- $this->assertEquals('foo', $obj->get());
-
- }
-
- function testGetEtag1() {
-
- $objectInfo = [
- 'calendardata' => 'foo',
- 'uri' => 'foo',
- 'etag' => 'bar',
- 'calendarid' => 1
- ];
-
- $backend = new Backend\Mock([], []);
- $obj = new CalendarObject($backend, [], $objectInfo);
-
- $this->assertEquals('bar', $obj->getETag());
-
- }
-
- function testGetEtag2() {
-
- $objectInfo = [
- 'calendardata' => 'foo',
- 'uri' => 'foo',
- 'calendarid' => 1
- ];
-
- $backend = new Backend\Mock([], []);
- $obj = new CalendarObject($backend, [], $objectInfo);
-
- $this->assertEquals('"' . md5('foo') . '"', $obj->getETag());
-
- }
-
- function testGetSupportedPrivilegesSet() {
-
- $objectInfo = [
- 'calendardata' => 'foo',
- 'uri' => 'foo',
- 'calendarid' => 1
- ];
-
- $backend = new Backend\Mock([], []);
- $obj = new CalendarObject($backend, [], $objectInfo);
- $this->assertNull($obj->getSupportedPrivilegeSet());
-
- }
-
- function testGetSize1() {
-
- $objectInfo = [
- 'calendardata' => 'foo',
- 'uri' => 'foo',
- 'calendarid' => 1
- ];
-
- $backend = new Backend\Mock([], []);
- $obj = new CalendarObject($backend, [], $objectInfo);
- $this->assertEquals(3, $obj->getSize());
-
- }
-
- function testGetSize2() {
-
- $objectInfo = [
- 'uri' => 'foo',
- 'calendarid' => 1,
- 'size' => 4,
- ];
-
- $backend = new Backend\Mock([], []);
- $obj = new CalendarObject($backend, [], $objectInfo);
- $this->assertEquals(4, $obj->getSize());
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php
deleted file mode 100644
index ca06d8ffa7b..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarQueryVAlarmTest.php
+++ /dev/null
@@ -1,122 +0,0 @@
-createComponent('VEVENT');
- $vevent->RRULE = 'FREQ=MONTHLY';
- $vevent->DTSTART = '20120101T120000Z';
- $vevent->UID = 'bla';
-
- $valarm = $vcalendar->createComponent('VALARM');
- $valarm->TRIGGER = '-P15D';
- $vevent->add($valarm);
-
-
- $vcalendar->add($vevent);
-
- $filter = [
- 'name' => 'VCALENDAR',
- 'is-not-defined' => false,
- 'time-range' => null,
- 'prop-filters' => [],
- 'comp-filters' => [
- [
- 'name' => 'VEVENT',
- 'is-not-defined' => false,
- 'time-range' => null,
- 'prop-filters' => [],
- 'comp-filters' => [
- [
- 'name' => 'VALARM',
- 'is-not-defined' => false,
- 'prop-filters' => [],
- 'comp-filters' => [],
- 'time-range' => [
- 'start' => new \DateTime('2012-05-10'),
- 'end' => new \DateTime('2012-05-20'),
- ],
- ],
- ],
- ],
- ],
- ];
-
- $validator = new CalendarQueryValidator();
- $this->assertTrue($validator->validate($vcalendar, $filter));
-
- $vcalendar = new VObject\Component\VCalendar();
-
- // A limited recurrence rule, should return false
- $vevent = $vcalendar->createComponent('VEVENT');
- $vevent->RRULE = 'FREQ=MONTHLY;COUNT=1';
- $vevent->DTSTART = '20120101T120000Z';
- $vevent->UID = 'bla';
-
- $valarm = $vcalendar->createComponent('VALARM');
- $valarm->TRIGGER = '-P15D';
- $vevent->add($valarm);
-
- $vcalendar->add($vevent);
-
- $this->assertFalse($validator->validate($vcalendar, $filter));
- }
-
- function testAlarmWayBefore() {
-
- $vcalendar = new VObject\Component\VCalendar();
-
- $vevent = $vcalendar->createComponent('VEVENT');
- $vevent->DTSTART = '20120101T120000Z';
- $vevent->UID = 'bla';
-
- $valarm = $vcalendar->createComponent('VALARM');
- $valarm->TRIGGER = '-P2W1D';
- $vevent->add($valarm);
-
- $vcalendar->add($vevent);
-
- $filter = [
- 'name' => 'VCALENDAR',
- 'is-not-defined' => false,
- 'time-range' => null,
- 'prop-filters' => [],
- 'comp-filters' => [
- [
- 'name' => 'VEVENT',
- 'is-not-defined' => false,
- 'time-range' => null,
- 'prop-filters' => [],
- 'comp-filters' => [
- [
- 'name' => 'VALARM',
- 'is-not-defined' => false,
- 'prop-filters' => [],
- 'comp-filters' => [],
- 'time-range' => [
- 'start' => new \DateTime('2011-12-10'),
- 'end' => new \DateTime('2011-12-20'),
- ],
- ],
- ],
- ],
- ],
- ];
-
- $validator = new CalendarQueryValidator();
- $this->assertTrue($validator->validate($vcalendar, $filter));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php
deleted file mode 100644
index f3305163bdf..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php
+++ /dev/null
@@ -1,829 +0,0 @@
-assertFalse($validator->validate($vcal, ['name' => 'VFOO']));
-
- }
-
- /**
- * @param string $icalObject
- * @param array $filters
- * @param int $outcome
- * @dataProvider provider
- */
- function testValid($icalObject, $filters, $outcome) {
-
- $validator = new CalendarQueryValidator();
-
- // Wrapping filter in a VCALENDAR component filter, as this is always
- // there anyway.
- $filters = [
- 'name' => 'VCALENDAR',
- 'comp-filters' => [$filters],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
-
- $vObject = VObject\Reader::read($icalObject);
-
- switch ($outcome) {
- case 0 :
- $this->assertFalse($validator->validate($vObject, $filters));
- break;
- case 1 :
- $this->assertTrue($validator->validate($vObject, $filters));
- break;
- case -1 :
- try {
- $validator->validate($vObject, $filters);
- $this->fail('This test was supposed to fail');
- } catch (\Exception $e) {
- // We need to test something to be valid for phpunit strict
- // mode.
- $this->assertTrue(true);
- } catch (\Throwable $e) {
- // PHP7
- $this->assertTrue(true);
- }
- break;
-
- }
-
- }
-
- function provider() {
-
- $blob1 = << 'VEVENT',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
- $filter2 = $filter1;
- $filter2['name'] = 'VTODO';
-
- $filter3 = $filter1;
- $filter3['is-not-defined'] = true;
-
- $filter4 = $filter1;
- $filter4['name'] = 'VTODO';
- $filter4['is-not-defined'] = true;
-
- $filter5 = $filter1;
- $filter5['comp-filters'] = [
- [
- 'name' => 'VALARM',
- 'is-not-defined' => false,
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'time-range' => null,
- ],
- ];
- $filter6 = $filter1;
- $filter6['prop-filters'] = [
- [
- 'name' => 'SUMMARY',
- 'is-not-defined' => false,
- 'param-filters' => [],
- 'time-range' => null,
- 'text-match' => null,
- ],
- ];
- $filter7 = $filter6;
- $filter7['prop-filters'][0]['name'] = 'DESCRIPTION';
-
- $filter8 = $filter6;
- $filter8['prop-filters'][0]['is-not-defined'] = true;
-
- $filter9 = $filter7;
- $filter9['prop-filters'][0]['is-not-defined'] = true;
-
- $filter10 = $filter5;
- $filter10['prop-filters'] = $filter6['prop-filters'];
-
- // Param filters
- $filter11 = $filter1;
- $filter11['prop-filters'] = [
- [
- 'name' => 'DTSTART',
- 'is-not-defined' => false,
- 'param-filters' => [
- [
- 'name' => 'VALUE',
- 'is-not-defined' => false,
- 'text-match' => null,
- ],
- ],
- 'time-range' => null,
- 'text-match' => null,
- ],
- ];
-
- $filter12 = $filter11;
- $filter12['prop-filters'][0]['param-filters'][0]['name'] = 'TZID';
-
- $filter13 = $filter11;
- $filter13['prop-filters'][0]['param-filters'][0]['is-not-defined'] = true;
-
- $filter14 = $filter12;
- $filter14['prop-filters'][0]['param-filters'][0]['is-not-defined'] = true;
-
- // Param text filter
- $filter15 = $filter11;
- $filter15['prop-filters'][0]['param-filters'][0]['text-match'] = [
- 'collation' => 'i;ascii-casemap',
- 'value' => 'dAtE',
- 'negate-condition' => false,
- ];
- $filter16 = $filter15;
- $filter16['prop-filters'][0]['param-filters'][0]['text-match']['collation'] = 'i;octet';
-
- $filter17 = $filter15;
- $filter17['prop-filters'][0]['param-filters'][0]['text-match']['negate-condition'] = true;
-
- $filter18 = $filter15;
- $filter18['prop-filters'][0]['param-filters'][0]['text-match']['negate-condition'] = true;
- $filter18['prop-filters'][0]['param-filters'][0]['text-match']['collation'] = 'i;octet';
-
- // prop + text
- $filter19 = $filter5;
- $filter19['comp-filters'][0]['prop-filters'] = [
- [
- 'name' => 'action',
- 'is-not-defined' => false,
- 'time-range' => null,
- 'param-filters' => [],
- 'text-match' => [
- 'collation' => 'i;ascii-casemap',
- 'value' => 'display',
- 'negate-condition' => false,
- ],
- ],
- ];
-
- // Time range
- $filter20 = [
- 'name' => 'VEVENT',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => [
- 'start' => new \DateTime('2011-01-01 10:00:00', new \DateTimeZone('GMT')),
- 'end' => new \DateTime('2011-01-01 13:00:00', new \DateTimeZone('GMT')),
- ],
- ];
- // Time range, no end date
- $filter21 = $filter20;
- $filter21['time-range']['end'] = null;
-
- // Time range, no start date
- $filter22 = $filter20;
- $filter22['time-range']['start'] = null;
-
- // Time range, other dates
- $filter23 = $filter20;
- $filter23['time-range'] = [
- 'start' => new \DateTime('2011-02-01 10:00:00', new \DateTimeZone('GMT')),
- 'end' => new \DateTime('2011-02-01 13:00:00', new \DateTimeZone('GMT')),
- ];
- // Time range
- $filter24 = [
- 'name' => 'VTODO',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => [
- 'start' => new \DateTime('2011-01-01 12:45:00', new \DateTimeZone('GMT')),
- 'end' => new \DateTime('2011-01-01 13:15:00', new \DateTimeZone('GMT')),
- ],
- ];
- // Time range, other dates (1 month in the future)
- $filter25 = $filter24;
- $filter25['time-range'] = [
- 'start' => new \DateTime('2011-02-01 10:00:00', new \DateTimeZone('GMT')),
- 'end' => new \DateTime('2011-02-01 13:00:00', new \DateTimeZone('GMT')),
- ];
- $filter26 = $filter24;
- $filter26['time-range'] = [
- 'start' => new \DateTime('2011-01-01 11:45:00', new \DateTimeZone('GMT')),
- 'end' => new \DateTime('2011-01-01 12:15:00', new \DateTimeZone('GMT')),
- ];
-
- // Time range for VJOURNAL
- $filter27 = [
- 'name' => 'VJOURNAL',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => [
- 'start' => new \DateTime('2011-01-01 12:45:00', new \DateTimeZone('GMT')),
- 'end' => new \DateTime('2011-01-01 13:15:00', new \DateTimeZone('GMT')),
- ],
- ];
- $filter28 = $filter27;
- $filter28['time-range'] = [
- 'start' => new \DateTime('2011-01-01 11:45:00', new \DateTimeZone('GMT')),
- 'end' => new \DateTime('2011-01-01 12:15:00', new \DateTimeZone('GMT')),
- ];
- // Time range for VFREEBUSY
- $filter29 = [
- 'name' => 'VFREEBUSY',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => [
- 'start' => new \DateTime('2011-01-01 12:45:00', new \DateTimeZone('GMT')),
- 'end' => new \DateTime('2011-01-01 13:15:00', new \DateTimeZone('GMT')),
- ],
- ];
- // Time range filter on property
- $filter30 = [
- 'name' => 'VEVENT',
- 'comp-filters' => [],
- 'prop-filters' => [
- [
- 'name' => 'DTSTART',
- 'is-not-defined' => false,
- 'param-filters' => [],
- 'time-range' => [
- 'start' => new \DateTime('2011-01-01 10:00:00', new \DateTimeZone('GMT')),
- 'end' => new \DateTime('2011-01-01 13:00:00', new \DateTimeZone('GMT')),
- ],
- 'text-match' => null,
- ],
- ],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
-
- // Time range for alarm
- $filter31 = [
- 'name' => 'VEVENT',
- 'prop-filters' => [],
- 'comp-filters' => [
- [
- 'name' => 'VALARM',
- 'is-not-defined' => false,
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'time-range' => [
- 'start' => new \DateTime('2011-01-01 10:45:00', new \DateTimeZone('GMT')),
- 'end' => new \DateTime('2011-01-01 11:15:00', new \DateTimeZone('GMT')),
- ],
- 'text-match' => null,
- ],
- ],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
- $filter32 = $filter31;
- $filter32['comp-filters'][0]['time-range'] = [
- 'start' => new \DateTime('2011-01-01 11:45:00', new \DateTimeZone('GMT')),
- 'end' => new \DateTime('2011-01-01 12:15:00', new \DateTimeZone('GMT')),
- ];
-
- $filter33 = $filter31;
- $filter33['name'] = 'VTODO';
- $filter34 = $filter32;
- $filter34['name'] = 'VTODO';
- $filter35 = $filter31;
- $filter35['name'] = 'VJOURNAL';
- $filter36 = $filter32;
- $filter36['name'] = 'VJOURNAL';
-
- // Time range filter on non-datetime property
- $filter37 = [
- 'name' => 'VEVENT',
- 'comp-filters' => [],
- 'prop-filters' => [
- [
- 'name' => 'SUMMARY',
- 'is-not-defined' => false,
- 'param-filters' => [],
- 'time-range' => [
- 'start' => new \DateTime('2011-01-01 10:00:00', new \DateTimeZone('GMT')),
- 'end' => new \DateTime('2011-01-01 13:00:00', new \DateTimeZone('GMT')),
- ],
- 'text-match' => null,
- ],
- ],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
-
- $filter38 = [
- 'name' => 'VEVENT',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => [
- 'start' => new \DateTime('2012-07-01 00:00:00', new \DateTimeZone('UTC')),
- 'end' => new \DateTime('2012-08-01 00:00:00', new \DateTimeZone('UTC')),
- ]
- ];
- $filter39 = [
- 'name' => 'VEVENT',
- 'comp-filters' => [
- [
- 'name' => 'VALARM',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => [
- 'start' => new \DateTime('2012-09-01 00:00:00', new \DateTimeZone('UTC')),
- 'end' => new \DateTime('2012-10-01 00:00:00', new \DateTimeZone('UTC')),
- ]
- ],
- ],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
-
- return [
-
- // Component check
-
- [$blob1, $filter1, 1],
- [$blob1, $filter2, 0],
- [$blob1, $filter3, 0],
- [$blob1, $filter4, 1],
-
- // Subcomponent check (4)
- [$blob1, $filter5, 0],
- [$blob2, $filter5, 1],
-
- // Property checki (6)
- [$blob1, $filter6, 1],
- [$blob1, $filter7, 0],
- [$blob1, $filter8, 0],
- [$blob1, $filter9, 1],
-
- // Subcomponent + property (10)
- [$blob2, $filter10, 1],
-
- // Param filter (11)
- [$blob3, $filter11, 1],
- [$blob3, $filter12, 0],
- [$blob3, $filter13, 0],
- [$blob3, $filter14, 1],
-
- // Param + text (15)
- [$blob3, $filter15, 1],
- [$blob3, $filter16, 0],
- [$blob3, $filter17, 0],
- [$blob3, $filter18, 1],
-
- // Prop + text (19)
- [$blob2, $filter19, 1],
-
- // Incorrect object (vcard) (20)
- [$blob4, $filter1, -1],
-
- // Time-range for event (21)
- [$blob5, $filter20, 1],
- [$blob6, $filter20, 1],
- [$blob7, $filter20, 1],
- [$blob8, $filter20, 1],
-
- [$blob5, $filter21, 1],
- [$blob5, $filter22, 1],
-
- [$blob5, $filter23, 0],
- [$blob6, $filter23, 0],
- [$blob7, $filter23, 0],
- [$blob8, $filter23, 0],
-
- // Time-range for todo (31)
- [$blob9, $filter24, 1],
- [$blob9, $filter25, 0],
- [$blob9, $filter26, 1],
- [$blob10, $filter24, 1],
- [$blob10, $filter25, 0],
- [$blob10, $filter26, 1],
-
- [$blob11, $filter24, 0],
- [$blob11, $filter25, 0],
- [$blob11, $filter26, 1],
-
- [$blob12, $filter24, 1],
- [$blob12, $filter25, 0],
- [$blob12, $filter26, 0],
-
- [$blob13, $filter24, 1],
- [$blob13, $filter25, 0],
- [$blob13, $filter26, 1],
-
- [$blob14, $filter24, 1],
- [$blob14, $filter25, 0],
- [$blob14, $filter26, 0],
-
- [$blob15, $filter24, 1],
- [$blob15, $filter25, 1],
- [$blob15, $filter26, 1],
-
- [$blob16, $filter24, 1],
- [$blob16, $filter25, 1],
- [$blob16, $filter26, 1],
-
- // Time-range for journals (55)
- [$blob17, $filter27, 0],
- [$blob17, $filter28, 0],
- [$blob18, $filter27, 0],
- [$blob18, $filter28, 1],
- [$blob19, $filter27, 1],
- [$blob19, $filter28, 1],
-
- // Time-range for free-busy (61)
- [$blob20, $filter29, -1],
-
- // Time-range on property (62)
- [$blob5, $filter30, 1],
- [$blob3, $filter37, -1],
- [$blob3, $filter30, 0],
-
- // Time-range on alarm in vevent (65)
- [$blob21, $filter31, 1],
- [$blob21, $filter32, 0],
- [$blob22, $filter31, 1],
- [$blob22, $filter32, 0],
- [$blob23, $filter31, 1],
- [$blob23, $filter32, 0],
- [$blob24, $filter31, 1],
- [$blob24, $filter32, 0],
- [$blob25, $filter31, 1],
- [$blob25, $filter32, 0],
- [$blob26, $filter31, 1],
- [$blob26, $filter32, 0],
-
- // Time-range on alarm for vtodo (77)
- [$blob27, $filter33, 1],
- [$blob27, $filter34, 0],
-
- // Time-range on alarm for vjournal (79)
- [$blob28, $filter35, -1],
- [$blob28, $filter36, -1],
-
- // Time-range on alarm with duration (81)
- [$blob29, $filter31, 1],
- [$blob29, $filter32, 0],
- [$blob30, $filter31, 0],
- [$blob30, $filter32, 0],
-
- // Time-range with RRULE (85)
- [$blob31, $filter20, 1],
- [$blob32, $filter20, 0],
-
- // Bug reported on mailing list, related to all-day events (87)
- //array($blob33, $filter38, 1),
-
- // Event in timerange, but filtered alarm is in the far future (88).
- [$blob34, $filter39, 0],
- ];
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarTest.php
deleted file mode 100644
index df85b6ded0d..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/CalendarTest.php
+++ /dev/null
@@ -1,256 +0,0 @@
-backend = TestUtil::getBackend();
-
- $this->calendars = $this->backend->getCalendarsForUser('principals/user1');
- $this->assertEquals(2, count($this->calendars));
- $this->calendar = new Calendar($this->backend, $this->calendars[0]);
-
-
- }
-
- function teardown() {
-
- unset($this->backend);
-
- }
-
- function testSimple() {
-
- $this->assertEquals($this->calendars[0]['uri'], $this->calendar->getName());
-
- }
-
- /**
- * @depends testSimple
- */
- function testUpdateProperties() {
-
- $propPatch = new PropPatch([
- '{DAV:}displayname' => 'NewName',
- ]);
-
- $result = $this->calendar->propPatch($propPatch);
- $result = $propPatch->commit();
-
- $this->assertEquals(true, $result);
-
- $calendars2 = $this->backend->getCalendarsForUser('principals/user1');
- $this->assertEquals('NewName', $calendars2[0]['{DAV:}displayname']);
-
- }
-
- /**
- * @depends testSimple
- */
- function testGetProperties() {
-
- $question = [
- '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set',
- ];
-
- $result = $this->calendar->getProperties($question);
-
- foreach ($question as $q) $this->assertArrayHasKey($q, $result);
-
- $this->assertEquals(['VEVENT', 'VTODO'], $result['{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set']->getValue());
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\NotFound
- * @depends testSimple
- */
- function testGetChildNotFound() {
-
- $this->calendar->getChild('randomname');
-
- }
-
- /**
- * @depends testSimple
- */
- function testGetChildren() {
-
- $children = $this->calendar->getChildren();
- $this->assertEquals(1, count($children));
-
- $this->assertTrue($children[0] instanceof CalendarObject);
-
- }
-
- /**
- * @depends testGetChildren
- */
- function testChildExists() {
-
- $this->assertFalse($this->calendar->childExists('foo'));
-
- $children = $this->calendar->getChildren();
- $this->assertTrue($this->calendar->childExists($children[0]->getName()));
- }
-
-
-
- /**
- * @expectedException Sabre\DAV\Exception\MethodNotAllowed
- */
- function testCreateDirectory() {
-
- $this->calendar->createDirectory('hello');
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\MethodNotAllowed
- */
- function testSetName() {
-
- $this->calendar->setName('hello');
-
- }
-
- function testGetLastModified() {
-
- $this->assertNull($this->calendar->getLastModified());
-
- }
-
- function testCreateFile() {
-
- $file = fopen('php://memory', 'r+');
- fwrite($file, TestUtil::getTestCalendarData());
- rewind($file);
-
- $this->calendar->createFile('hello', $file);
-
- $file = $this->calendar->getChild('hello');
- $this->assertTrue($file instanceof CalendarObject);
-
- }
-
- function testCreateFileNoSupportedComponents() {
-
- $file = fopen('php://memory', 'r+');
- fwrite($file, TestUtil::getTestCalendarData());
- rewind($file);
-
- $calendar = new Calendar($this->backend, $this->calendars[1]);
- $calendar->createFile('hello', $file);
-
- $file = $calendar->getChild('hello');
- $this->assertTrue($file instanceof CalendarObject);
-
- }
-
- function testDelete() {
-
- $this->calendar->delete();
-
- $calendars = $this->backend->getCalendarsForUser('principals/user1');
- $this->assertEquals(1, count($calendars));
- }
-
- function testGetOwner() {
-
- $this->assertEquals('principals/user1', $this->calendar->getOwner());
-
- }
-
- function testGetGroup() {
-
- $this->assertNull($this->calendar->getGroup());
-
- }
-
- function testGetACL() {
-
- $expected = [
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user1',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user1/calendar-proxy-write',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user1/calendar-proxy-read',
- 'protected' => true,
- ],
- [
- 'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy',
- 'principal' => '{DAV:}authenticated',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}write',
- 'principal' => 'principals/user1',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}write',
- 'principal' => 'principals/user1/calendar-proxy-write',
- 'protected' => true,
- ],
- ];
- $this->assertEquals($expected, $this->calendar->getACL());
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\Forbidden
- */
- function testSetACL() {
-
- $this->calendar->setACL([]);
-
- }
-
- function testGetSyncToken() {
-
- $this->assertNull($this->calendar->getSyncToken());
-
- }
-
- function testGetSyncTokenNoSyncSupport() {
-
- $calendar = new Calendar(new Backend\Mock([], []), []);
- $this->assertNull($calendar->getSyncToken());
-
- }
-
- function testGetChanges() {
-
- $this->assertNull($this->calendar->getChanges(1, 1));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php
deleted file mode 100644
index 9a3d47828fb..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php
+++ /dev/null
@@ -1,113 +0,0 @@
- 1,
- 'name' => 'Calendar',
- 'principaluri' => 'principals/user1',
- 'uri' => 'calendar1',
- ]
- ];
-
- protected $caldavCalendarObjects = [
- 1 => [
- 'event.ics' => [
- 'calendardata' => 'BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-DTEND;TZID=Europe/Berlin:20120207T191500
-RRULE:FREQ=DAILY;INTERVAL=1;COUNT=3
-SUMMARY:RecurringEvents 3 times
-DTSTART;TZID=Europe/Berlin:20120207T181500
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20120207T111900Z
-UID:foobar
-DTEND;TZID=Europe/Berlin:20120208T191500
-SUMMARY:RecurringEvents 3 times OVERWRITTEN
-DTSTART;TZID=Europe/Berlin:20120208T181500
-RECURRENCE-ID;TZID=Europe/Berlin:20120208T181500
-END:VEVENT
-END:VCALENDAR
-',
- ],
- ],
- ];
-
- function testExpand() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_CONTENT_TYPE' => 'application/xml',
- 'REQUEST_URI' => '/calendars/user1/calendar1',
- 'HTTP_DEPTH' => '1',
- ]);
-
- $request->setBody('
-
-
-
-
-
-
-
-
-
-
-
- ');
-
- $response = $this->request($request);
-
- // Everts super awesome xml parser.
- $body = substr(
- $response->body,
- $start = strpos($response->body, 'BEGIN:VCALENDAR'),
- strpos($response->body, 'END:VCALENDAR') - $start + 13
- );
- $body = str_replace('
', '', $body);
-
- try {
- $vObject = VObject\Reader::read($body);
- } catch (VObject\ParseException $e) {
- $this->fail('Could not parse object. Error:' . $e->getMessage() . ' full object: ' . $response->getBodyAsString());
- }
-
- // check if DTSTARTs and DTENDs are correct
- foreach ($vObject->VEVENT as $vevent) {
- /** @var $vevent Sabre\VObject\Component\VEvent */
- foreach ($vevent->children() as $child) {
- /** @var $child Sabre\VObject\Property */
- if ($child->name == 'DTSTART') {
- // DTSTART has to be one of three valid values
- $this->assertContains($child->getValue(), ['20120207T171500Z', '20120208T171500Z', '20120209T171500Z'], 'DTSTART is not a valid value: ' . $child->getValue());
- } elseif ($child->name == 'DTEND') {
- // DTEND has to be one of three valid values
- $this->assertContains($child->getValue(), ['20120207T181500Z', '20120208T181500Z', '20120209T181500Z'], 'DTEND is not a valid value: ' . $child->getValue());
- }
- }
- }
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php
deleted file mode 100644
index efc49673f3f..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
- 1,
- 'name' => 'Calendar',
- 'principaluri' => 'principals/user1',
- 'uri' => 'calendar1',
- ]
- ];
-
- protected $caldavCalendarObjects = [
- 1 => [
- 'event.ics' => [
- 'calendardata' => 'BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-DTEND;TZID=Europe/Berlin:20120207T191500
-RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=TU,TH
-SUMMARY:RecurringEvents on tuesday and thursday
-DTSTART;TZID=Europe/Berlin:20120207T181500
-END:VEVENT
-END:VCALENDAR
-',
- ],
- ],
- ];
-
- function testExpandRecurringByDayEvent() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_CONTENT_TYPE' => 'application/xml',
- 'REQUEST_URI' => '/calendars/user1/calendar1',
- 'HTTP_DEPTH' => '1',
- ]);
-
- $request->setBody('
-
-
-
-
-
-
-
-
-
-
-
- ');
-
- $response = $this->request($request);
-
- // Everts super awesome xml parser.
- $body = substr(
- $response->body,
- $start = strpos($response->body, 'BEGIN:VCALENDAR'),
- strpos($response->body, 'END:VCALENDAR') - $start + 13
- );
- $body = str_replace('
', '', $body);
-
- $vObject = VObject\Reader::read($body);
-
- $this->assertEquals(2, count($vObject->VEVENT));
-
- // check if DTSTARTs and DTENDs are correct
- foreach ($vObject->VEVENT as $vevent) {
- /** @var $vevent Sabre\VObject\Component\VEvent */
- foreach ($vevent->children() as $child) {
- /** @var $child Sabre\VObject\Property */
- if ($child->name == 'DTSTART') {
- // DTSTART has to be one of two valid values
- $this->assertContains($child->getValue(), ['20120214T171500Z', '20120216T171500Z'], 'DTSTART is not a valid value: ' . $child->getValue());
- } elseif ($child->name == 'DTEND') {
- // DTEND has to be one of two valid values
- $this->assertContains($child->getValue(), ['20120214T181500Z', '20120216T181500Z'], 'DTEND is not a valid value: ' . $child->getValue());
- }
- }
- }
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php
deleted file mode 100644
index 3a22e03d4a5..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php
+++ /dev/null
@@ -1,103 +0,0 @@
- 1,
- 'name' => 'Calendar',
- 'principaluri' => 'principals/user1',
- 'uri' => 'calendar1',
- ]
- ];
-
- protected $caldavCalendarObjects = [
- 1 => [
- 'event.ics' => [
- 'calendardata' => 'BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-DTEND;TZID=Europe/Berlin:20120207T191500
-RRULE:FREQ=DAILY;INTERVAL=1;COUNT=3
-SUMMARY:RecurringEvents 3 times
-DTSTART;TZID=Europe/Berlin:20120207T181500
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20120207T111900Z
-UID:foobar
-DTEND;TZID=Europe/Berlin:20120208T191500
-SUMMARY:RecurringEvents 3 times OVERWRITTEN
-DTSTART;TZID=Europe/Berlin:20120208T181500
-RECURRENCE-ID;TZID=Europe/Berlin:20120208T181500
-END:VEVENT
-END:VCALENDAR
-',
- ],
- ],
- ];
-
- function testExpand() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_CONTENT_TYPE' => 'application/xml',
- 'REQUEST_URI' => '/calendars/user1/calendar1',
- 'HTTP_DEPTH' => '1',
- ]);
-
- $request->setBody('
-
-
-
-
-
-
-
-
-
-
-
- ');
-
- $response = $this->request($request);
-
- // Everts super awesome xml parser.
- $body = substr(
- $response->body,
- $start = strpos($response->body, 'BEGIN:VCALENDAR'),
- strpos($response->body, 'END:VCALENDAR') - $start + 13
- );
- $body = str_replace('
', '', $body);
-
- $vObject = VObject\Reader::read($body);
-
- // We only expect 3 events
- $this->assertEquals(3, count($vObject->VEVENT), 'We got 6 events instead of 3. Output: ' . $body);
-
- // TZID should be gone
- $this->assertFalse(isset($vObject->VEVENT->DTSTART['TZID']));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/ExpandEventsFloatingTimeTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/ExpandEventsFloatingTimeTest.php
deleted file mode 100644
index fba47d79ba1..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/ExpandEventsFloatingTimeTest.php
+++ /dev/null
@@ -1,207 +0,0 @@
- 1,
- 'name' => 'Calendar',
- 'principaluri' => 'principals/user1',
- 'uri' => 'calendar1',
- '{urn:ietf:params:xml:ns:caldav}calendar-timezone' => 'BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-BEGIN:VTIMEZONE
-TZID:Europe/Berlin
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-DTSTART:19810329T020000
-TZNAME:GMT+2
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-DTSTART:19961027T030000
-TZNAME:GMT+1
-TZOFFSETTO:+0100
-END:STANDARD
-END:VTIMEZONE
-END:VCALENDAR',
- ]
- ];
-
- protected $caldavCalendarObjects = [
- 1 => [
- 'event.ics' => [
- 'calendardata' => 'BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-BEGIN:VEVENT
-CREATED:20140701T143658Z
-UID:dba46fe8-1631-4d98-a575-97963c364dfe
-DTEND:20141108T073000
-TRANSP:OPAQUE
-SUMMARY:Floating Time event, starting 05:30am Europe/Berlin
-DTSTART:20141108T053000
-DTSTAMP:20140701T143706Z
-SEQUENCE:1
-END:VEVENT
-END:VCALENDAR
-',
- ],
- ],
- ];
-
- function testExpandCalendarQuery() {
-
- $request = new HTTP\Request('REPORT', '/calendars/user1/calendar1', [
- 'Depth' => 1,
- 'Content-Type' => 'application/xml',
- ]);
-
- $request->setBody('
-
-
-
-
-
-
-
-
-
-
-
- ');
-
- $response = $this->request($request);
-
- // Everts super awesome xml parser.
- $body = substr(
- $response->body,
- $start = strpos($response->body, 'BEGIN:VCALENDAR'),
- strpos($response->body, 'END:VCALENDAR') - $start + 13
- );
- $body = str_replace('
', '', $body);
-
- $vObject = VObject\Reader::read($body);
-
- // check if DTSTARTs and DTENDs are correct
- foreach ($vObject->VEVENT as $vevent) {
- /** @var $vevent Sabre\VObject\Component\VEvent */
- foreach ($vevent->children() as $child) {
- /** @var $child Sabre\VObject\Property */
- if ($child->name == 'DTSTART') {
- // DTSTART should be the UTC equivalent of given floating time
- $this->assertEquals('20141108T043000Z', $child->getValue());
- } elseif ($child->name == 'DTEND') {
- // DTEND should be the UTC equivalent of given floating time
- $this->assertEquals('20141108T063000Z', $child->getValue());
- }
- }
- }
- }
-
- function testExpandMultiGet() {
-
- $request = new HTTP\Request('REPORT', '/calendars/user1/calendar1', [
- 'Depth' => 1,
- 'Content-Type' => 'application/xml',
- ]);
-
- $request->setBody('
-
-
-
-
-
- /calendars/user1/calendar1/event.ics
- ');
-
- $response = $this->request($request);
-
- $this->assertEquals(207, $response->getStatus());
-
- // Everts super awesome xml parser.
- $body = substr(
- $response->body,
- $start = strpos($response->body, 'BEGIN:VCALENDAR'),
- strpos($response->body, 'END:VCALENDAR') - $start + 13
- );
- $body = str_replace('
', '', $body);
-
- $vObject = VObject\Reader::read($body);
-
- // check if DTSTARTs and DTENDs are correct
- foreach ($vObject->VEVENT as $vevent) {
- /** @var $vevent Sabre\VObject\Component\VEvent */
- foreach ($vevent->children() as $child) {
- /** @var $child Sabre\VObject\Property */
- if ($child->name == 'DTSTART') {
- // DTSTART should be the UTC equivalent of given floating time
- $this->assertEquals($child->getValue(), '20141108T043000Z');
- } elseif ($child->name == 'DTEND') {
- // DTEND should be the UTC equivalent of given floating time
- $this->assertEquals($child->getValue(), '20141108T063000Z');
- }
- }
- }
- }
-
- function testExpandExport() {
-
- $request = new HTTP\Request('GET', '/calendars/user1/calendar1?export&start=1&end=2000000000&expand=1', [
- 'Depth' => 1,
- 'Content-Type' => 'application/xml',
- ]);
-
- $response = $this->request($request);
-
- $this->assertEquals(200, $response->getStatus());
-
- // Everts super awesome xml parser.
- $body = substr(
- $response->body,
- $start = strpos($response->body, 'BEGIN:VCALENDAR'),
- strpos($response->body, 'END:VCALENDAR') - $start + 13
- );
- $body = str_replace('
', '', $body);
-
- $vObject = VObject\Reader::read($body);
-
- // check if DTSTARTs and DTENDs are correct
- foreach ($vObject->VEVENT as $vevent) {
- /** @var $vevent Sabre\VObject\Component\VEvent */
- foreach ($vevent->children() as $child) {
- /** @var $child Sabre\VObject\Property */
- if ($child->name == 'DTSTART') {
- // DTSTART should be the UTC equivalent of given floating time
- $this->assertEquals('20141108T043000Z', $child->getValue());
- } elseif ($child->name == 'DTEND') {
- // DTEND should be the UTC equivalent of given floating time
- $this->assertEquals('20141108T063000Z', $child->getValue());
- }
- }
- }
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php
deleted file mode 100644
index 7604c7f4c1b..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/FreeBusyReportTest.php
+++ /dev/null
@@ -1,174 +0,0 @@
- [
- 'obj1' => [
- 'calendarid' => 1,
- 'uri' => 'event1.ics',
- 'calendardata' => $obj1,
- ],
- 'obj2' => [
- 'calendarid' => 1,
- 'uri' => 'event2.ics',
- 'calendardata' => $obj2
- ],
- 'obj3' => [
- 'calendarid' => 1,
- 'uri' => 'event3.ics',
- 'calendardata' => $obj3
- ]
- ],
- ];
-
-
- $caldavBackend = new Backend\Mock([], $calendarData);
-
- $calendar = new Calendar($caldavBackend, [
- 'id' => 1,
- 'uri' => 'calendar',
- 'principaluri' => 'principals/user1',
- '{' . Plugin::NS_CALDAV . '}calendar-timezone' => "BEGIN:VCALENDAR\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nEND:VTIMEZONE\r\nEND:VCALENDAR",
- ]);
-
- $this->server = new DAV\Server([$calendar]);
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_URI' => '/calendar',
- ]);
- $this->server->httpRequest = $request;
- $this->server->httpResponse = new HTTP\ResponseMock();
-
- $this->plugin = new Plugin();
- $this->server->addPlugin($this->plugin);
-
- }
-
- function testFreeBusyReport() {
-
- $reportXML = <<
-
-
-XML;
-
- $report = $this->server->xml->parse($reportXML, null, $rootElem);
- $this->plugin->report($rootElem, $report, null);
-
- $this->assertEquals(200, $this->server->httpResponse->status);
- $this->assertEquals('text/calendar', $this->server->httpResponse->getHeader('Content-Type'));
- $this->assertTrue(strpos($this->server->httpResponse->body, 'BEGIN:VFREEBUSY') !== false);
- $this->assertTrue(strpos($this->server->httpResponse->body, '20111005T120000Z/20111005T130000Z') !== false);
- $this->assertTrue(strpos($this->server->httpResponse->body, '20111006T100000Z/20111006T110000Z') !== false);
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\BadRequest
- */
- function testFreeBusyReportNoTimeRange() {
-
- $reportXML = <<
-
-
-XML;
-
- $report = $this->server->xml->parse($reportXML, null, $rootElem);
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\NotImplemented
- */
- function testFreeBusyReportWrongNode() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_URI' => '/',
- ]);
- $this->server->httpRequest = $request;
-
- $reportXML = <<
-
-
-XML;
-
- $report = $this->server->xml->parse($reportXML, null, $rootElem);
- $this->plugin->report($rootElem, $report, null);
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception
- */
- function testFreeBusyReportNoACLPlugin() {
-
- $this->server = new DAV\Server();
- $this->plugin = new Plugin();
- $this->server->addPlugin($this->plugin);
-
- $reportXML = <<
-
-
-XML;
-
- $report = $this->server->xml->parse($reportXML, null, $rootElem);
- $this->plugin->report($rootElem, $report, null);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
deleted file mode 100644
index 5fd8d29a11b..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
+++ /dev/null
@@ -1,82 +0,0 @@
- 1,
- 'name' => 'Calendar',
- 'principaluri' => 'principals/user1',
- 'uri' => 'calendar1',
- ]
- ];
-
- protected $caldavCalendarObjects = [
- 1 => [
- 'event.ics' => [
- 'calendardata' => 'BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-CREATED:20120313T142342Z
-UID:171EBEFC-C951-499D-B234-7BA7D677B45D
-DTEND;TZID=Europe/Berlin:20120227T010000
-TRANSP:OPAQUE
-SUMMARY:Monday 0h
-DTSTART;TZID=Europe/Berlin:20120227T000000
-DTSTAMP:20120313T142416Z
-SEQUENCE:4
-END:VEVENT
-END:VCALENDAR
-',
- ],
- ],
- ];
-
- function testQueryTimerange() {
-
- $request = new HTTP\Request(
- 'REPORT',
- '/calendars/user1/calendar1',
- [
- 'Content-Type' => 'application/xml',
- 'Depth' => '1',
- ]
- );
-
- $request->setBody('
-
-
-
-
-
-
-
-
-
-
-
- ');
-
- $response = $this->request($request);
-
- $this->assertTrue(strpos($response->body, 'BEGIN:VCALENDAR') !== false);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/ICSExportPluginTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/ICSExportPluginTest.php
deleted file mode 100644
index 75412577e9b..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/ICSExportPluginTest.php
+++ /dev/null
@@ -1,386 +0,0 @@
-icsExportPlugin = new ICSExportPlugin();
- $this->server->addPlugin(
- $this->icsExportPlugin
- );
-
- $id = $this->caldavBackend->createCalendar(
- 'principals/admin',
- 'UUID-123467',
- [
- '{DAV:}displayname' => 'Hello!',
- '{http://apple.com/ns/ical/}calendar-color' => '#AA0000FF',
- ]
- );
-
- $this->caldavBackend->createCalendarObject(
- $id,
- 'event-1',
- <<caldavBackend->createCalendarObject(
- $id,
- 'todo-1',
- <<assertEquals(
- $this->icsExportPlugin,
- $this->server->getPlugin('ics-export')
- );
- $this->assertEquals($this->icsExportPlugin, $this->server->getPlugin('ics-export'));
- $this->assertEquals('ics-export', $this->icsExportPlugin->getPluginInfo()['name']);
-
- }
-
- function testBeforeMethod() {
-
- $request = new HTTP\Request(
- 'GET',
- '/calendars/admin/UUID-123467?export'
- );
-
- $response = $this->request($request);
-
- $this->assertEquals(200, $response->getStatus());
- $this->assertEquals('text/calendar', $response->getHeader('Content-Type'));
-
- $obj = VObject\Reader::read($response->body);
-
- $this->assertEquals(8, 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"});
-
- }
- function testBeforeMethodNoVersion() {
-
- $request = new HTTP\Request(
- 'GET',
- '/calendars/admin/UUID-123467?export'
- );
- DAV\Server::$exposeVersion = false;
- $response = $this->request($request);
- DAV\Server::$exposeVersion = true;
-
- $this->assertEquals(200, $response->getStatus());
- $this->assertEquals('text/calendar', $response->getHeader('Content-Type'));
-
- $obj = VObject\Reader::read($response->body);
-
- $this->assertEquals(8, 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));
-
- }
-
- function testBeforeMethodNoExport() {
-
- $request = new HTTP\Request(
- 'GET',
- '/calendars/admin/UUID-123467'
- );
- $response = new HTTP\Response();
- $this->assertNull($this->icsExportPlugin->httpGet($request, $response));
-
- }
-
- function testACLIntegrationBlocked() {
-
- $aclPlugin = new DAVACL\Plugin();
- $aclPlugin->allowUnauthenticatedAccess = false;
- $this->server->addPlugin(
- $aclPlugin
- );
-
- $request = new HTTP\Request(
- 'GET',
- '/calendars/admin/UUID-123467?export'
- );
-
- $this->request($request, 403);
-
- }
-
- function testACLIntegrationNotBlocked() {
-
- $aclPlugin = new DAVACL\Plugin();
- $aclPlugin->allowUnauthenticatedAccess = false;
- $this->server->addPlugin(
- $aclPlugin
- );
- $this->server->addPlugin(
- new Plugin()
- );
-
- $this->autoLogin('admin');
-
- $request = new HTTP\Request(
- 'GET',
- '/calendars/admin/UUID-123467?export'
- );
-
- $response = $this->request($request, 200);
- $this->assertEquals('text/calendar', $response->getHeader('Content-Type'));
-
- $obj = VObject\Reader::read($response->body);
-
- $this->assertEquals(8, 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));
-
- }
-
- function testBadStartParam() {
-
- $request = new HTTP\Request(
- 'GET',
- '/calendars/admin/UUID-123467?export&start=foo'
- );
- $this->request($request, 400);
-
- }
-
- function testBadEndParam() {
-
- $request = new HTTP\Request(
- 'GET',
- '/calendars/admin/UUID-123467?export&end=foo'
- );
- $this->request($request, 400);
-
- }
-
- function testFilterStartEnd() {
-
- $request = new HTTP\Request(
- 'GET',
- '/calendars/admin/UUID-123467?export&start=1&end=2'
- );
- $response = $this->request($request, 200);
-
- $obj = VObject\Reader::read($response->getBody());
-
- $this->assertEquals(0, count($obj->VTIMEZONE));
- $this->assertEquals(0, count($obj->VEVENT));
-
- }
-
- function testExpandNoStart() {
-
- $request = new HTTP\Request(
- 'GET',
- '/calendars/admin/UUID-123467?export&expand=1&end=2'
- );
- $this->request($request, 400);
-
- }
-
- function testExpand() {
-
- $request = new HTTP\Request(
- 'GET',
- '/calendars/admin/UUID-123467?export&start=1&end=2000000000&expand=1'
- );
- $response = $this->request($request, 200);
-
- $obj = VObject\Reader::read($response->getBody());
-
- $this->assertEquals(0, count($obj->VTIMEZONE));
- $this->assertEquals(1, count($obj->VEVENT));
-
- }
-
- function testJCal() {
-
- $request = new HTTP\Request(
- 'GET',
- '/calendars/admin/UUID-123467?export',
- ['Accept' => 'application/calendar+json']
- );
-
- $response = $this->request($request, 200);
- $this->assertEquals('application/calendar+json', $response->getHeader('Content-Type'));
-
- }
-
- function testJCalInUrl() {
-
- $request = new HTTP\Request(
- 'GET',
- '/calendars/admin/UUID-123467?export&accept=jcal'
- );
-
- $response = $this->request($request, 200);
- $this->assertEquals('application/calendar+json', $response->getHeader('Content-Type'));
-
- }
-
- function testNegotiateDefault() {
-
- $request = new HTTP\Request(
- 'GET',
- '/calendars/admin/UUID-123467?export',
- ['Accept' => 'text/plain']
- );
-
- $response = $this->request($request, 200);
- $this->assertEquals('text/calendar', $response->getHeader('Content-Type'));
-
- }
-
- function testFilterComponentVEVENT() {
-
- $request = new HTTP\Request(
- 'GET',
- '/calendars/admin/UUID-123467?export&componentType=VEVENT'
- );
-
- $response = $this->request($request, 200);
-
- $obj = VObject\Reader::read($response->body);
- $this->assertEquals(1, count($obj->VTIMEZONE));
- $this->assertEquals(1, count($obj->VEVENT));
- $this->assertEquals(0, count($obj->VTODO));
-
- }
-
- function testFilterComponentVTODO() {
-
- $request = new HTTP\Request(
- 'GET',
- '/calendars/admin/UUID-123467?export&componentType=VTODO'
- );
-
- $response = $this->request($request, 200);
-
- $obj = VObject\Reader::read($response->body);
-
- $this->assertEquals(0, count($obj->VTIMEZONE));
- $this->assertEquals(0, count($obj->VEVENT));
- $this->assertEquals(1, count($obj->VTODO));
-
- }
-
- function testFilterComponentBadComponent() {
-
- $request = new HTTP\Request(
- 'GET',
- '/calendars/admin/UUID-123467?export&componentType=VVOODOO'
- );
-
- $response = $this->request($request, 400);
-
- }
-
- function testContentDisposition() {
-
- $request = new HTTP\Request(
- 'GET',
- '/calendars/admin/UUID-123467?export'
- );
-
- $response = $this->request($request, 200);
- $this->assertEquals('text/calendar', $response->getHeader('Content-Type'));
- $this->assertEquals(
- 'attachment; filename="UUID-123467-' . date('Y-m-d') . '.ics"',
- $response->getHeader('Content-Disposition')
- );
-
- }
-
- function testContentDispositionJson() {
-
- $request = new HTTP\Request(
- 'GET',
- '/calendars/admin/UUID-123467?export',
- ['Accept' => 'application/calendar+json']
- );
-
- $response = $this->request($request, 200);
- $this->assertEquals('application/calendar+json', $response->getHeader('Content-Type'));
- $this->assertEquals(
- 'attachment; filename="UUID-123467-' . date('Y-m-d') . '.json"',
- $response->getHeader('Content-Disposition')
- );
-
- }
-
- function testContentDispositionBadChars() {
-
- $this->caldavBackend->createCalendar(
- 'principals/admin',
- 'UUID-b_ad"(ch)ars',
- [
- '{DAV:}displayname' => 'Test bad characters',
- '{http://apple.com/ns/ical/}calendar-color' => '#AA0000FF',
- ]
- );
-
- $request = new HTTP\Request(
- 'GET',
- '/calendars/admin/UUID-b_ad"(ch)ars?export',
- ['Accept' => 'application/calendar+json']
- );
-
- $response = $this->request($request, 200);
- $this->assertEquals('application/calendar+json', $response->getHeader('Content-Type'));
- $this->assertEquals(
- 'attachment; filename="UUID-b_adchars-' . date('Y-m-d') . '.json"',
- $response->getHeader('Content-Disposition')
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue166Test.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue166Test.php
deleted file mode 100644
index a1a9b7c0443..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue166Test.php
+++ /dev/null
@@ -1,63 +0,0 @@
- 'VCALENDAR',
- 'comp-filters' => [
- [
- 'name' => 'VEVENT',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => [
- 'start' => new \DateTime('2011-12-01'),
- 'end' => new \DateTime('2012-02-01'),
- ],
- ],
- ],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => null,
- ];
- $input = VObject\Reader::read($input);
- $this->assertTrue($validator->validate($input, $filters));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue172Test.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue172Test.php
deleted file mode 100644
index e2b85c2bcdd..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue172Test.php
+++ /dev/null
@@ -1,135 +0,0 @@
- 'VCALENDAR',
- 'comp-filters' => [
- [
- 'name' => 'VEVENT',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => [
- 'start' => new \DateTime('2012-01-18 21:00:00 GMT-08:00'),
- 'end' => new \DateTime('2012-01-18 21:00:00 GMT-08:00'),
- ],
- ],
- ],
- 'prop-filters' => [],
- ];
- $input = VObject\Reader::read($input);
- $this->assertTrue($validator->validate($input, $filters));
- }
-
- // Pacific Standard Time, translates to America/Los_Angeles (GMT-8 in January)
- function testOutlookTimezoneName() {
- $input = << 'VCALENDAR',
- 'comp-filters' => [
- [
- 'name' => 'VEVENT',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => [
- 'start' => new \DateTime('2012-01-13 10:30:00 GMT-08:00'),
- 'end' => new \DateTime('2012-01-13 10:30:00 GMT-08:00'),
- ],
- ],
- ],
- 'prop-filters' => [],
- ];
- $input = VObject\Reader::read($input);
- $this->assertTrue($validator->validate($input, $filters));
- }
-
- // X-LIC-LOCATION, translates to America/Los_Angeles (GMT-8 in January)
- function testLibICalLocationName() {
- $input = << 'VCALENDAR',
- 'comp-filters' => [
- [
- 'name' => 'VEVENT',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false,
- 'time-range' => [
- 'start' => new \DateTime('2012-01-13 10:30:00 GMT-08:00'),
- 'end' => new \DateTime('2012-01-13 10:30:00 GMT-08:00'),
- ],
- ],
- ],
- 'prop-filters' => [],
- ];
- $input = VObject\Reader::read($input);
- $this->assertTrue($validator->validate($input, $filters));
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue203Test.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue203Test.php
deleted file mode 100644
index 369e9a70c12..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue203Test.php
+++ /dev/null
@@ -1,137 +0,0 @@
- 1,
- 'name' => 'Calendar',
- 'principaluri' => 'principals/user1',
- 'uri' => 'calendar1',
- ]
- ];
-
- protected $caldavCalendarObjects = [
- 1 => [
- 'event.ics' => [
- 'calendardata' => 'BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:20120330T155305CEST-6585fBUVgV
-DTSTAMP:20120330T135305Z
-DTSTART;TZID=Europe/Berlin:20120326T155200
-DTEND;TZID=Europe/Berlin:20120326T165200
-RRULE:FREQ=DAILY;COUNT=2;INTERVAL=1
-SUMMARY:original summary
-TRANSP:OPAQUE
-END:VEVENT
-BEGIN:VEVENT
-UID:20120330T155305CEST-6585fBUVgV
-DTSTAMP:20120330T135352Z
-DESCRIPTION:
-DTSTART;TZID=Europe/Berlin:20120328T155200
-DTEND;TZID=Europe/Berlin:20120328T165200
-RECURRENCE-ID;TZID=Europe/Berlin:20120327T155200
-SEQUENCE:1
-SUMMARY:overwritten summary
-TRANSP:OPAQUE
-END:VEVENT
-END:VCALENDAR
-',
- ],
- ],
- ];
-
- function testIssue203() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_CONTENT_TYPE' => 'application/xml',
- 'REQUEST_URI' => '/calendars/user1/calendar1',
- 'HTTP_DEPTH' => '1',
- ]);
-
- $request->setBody('
-
-
-
-
-
-
-
-
-
-
-
- ');
-
- $response = $this->request($request);
-
- // Everts super awesome xml parser.
- $body = substr(
- $response->body,
- $start = strpos($response->body, 'BEGIN:VCALENDAR'),
- strpos($response->body, 'END:VCALENDAR') - $start + 13
- );
- $body = str_replace('
', '', $body);
-
- $vObject = VObject\Reader::read($body);
-
- $this->assertEquals(2, count($vObject->VEVENT));
-
-
- $expectedEvents = [
- [
- 'DTSTART' => '20120326T135200Z',
- 'DTEND' => '20120326T145200Z',
- 'SUMMARY' => 'original summary',
- ],
- [
- 'DTSTART' => '20120328T135200Z',
- 'DTEND' => '20120328T145200Z',
- 'SUMMARY' => 'overwritten summary',
- 'RECURRENCE-ID' => '20120327T135200Z',
- ]
- ];
-
- // try to match agains $expectedEvents array
- foreach ($expectedEvents as $expectedEvent) {
-
- $matching = false;
-
- foreach ($vObject->VEVENT as $vevent) {
- /** @var $vevent Sabre\VObject\Component\VEvent */
- foreach ($vevent->children() as $child) {
- /** @var $child Sabre\VObject\Property */
- if (isset($expectedEvent[$child->name])) {
- if ($expectedEvent[$child->name] != $child->getValue()) {
- continue 2;
- }
- }
- }
-
- $matching = true;
- break;
- }
-
- $this->assertTrue($matching, 'Did not find the following event in the response: ' . var_export($expectedEvent, true));
- }
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue205Test.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue205Test.php
deleted file mode 100644
index ce40a90b035..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue205Test.php
+++ /dev/null
@@ -1,98 +0,0 @@
- 1,
- 'name' => 'Calendar',
- 'principaluri' => 'principals/user1',
- 'uri' => 'calendar1',
- ]
- ];
-
- protected $caldavCalendarObjects = [
- 1 => [
- 'event.ics' => [
- 'calendardata' => 'BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:20120330T155305CEST-6585fBUVgV
-DTSTAMP:20120330T135305Z
-DTSTART;TZID=Europe/Berlin:20120326T155200
-DTEND;TZID=Europe/Berlin:20120326T165200
-SUMMARY:original summary
-TRANSP:OPAQUE
-BEGIN:VALARM
-ACTION:AUDIO
-ATTACH;VALUE=URI:Basso
-TRIGGER:PT0S
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-',
- ],
- ],
- ];
-
- function testIssue205() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_CONTENT_TYPE' => 'application/xml',
- 'REQUEST_URI' => '/calendars/user1/calendar1',
- 'HTTP_DEPTH' => '1',
- ]);
-
- $request->setBody('
-
-
-
-
-
-
-
-
-
-
-
-
-
- ');
-
- $response = $this->request($request);
-
- $this->assertFalse(strpos($response->body, 'Exception '), 'Exception occurred: ' . $response->body);
- $this->assertFalse(strpos($response->body, 'Unknown or bad format'), 'DateTime unknown format Exception: ' . $response->body);
-
- // Everts super awesome xml parser.
- $body = substr(
- $response->body,
- $start = strpos($response->body, 'BEGIN:VCALENDAR'),
- strpos($response->body, 'END:VCALENDAR') - $start + 13
- );
- $body = str_replace('
', '', $body);
-
- $vObject = VObject\Reader::read($body);
-
- $this->assertEquals(1, count($vObject->VEVENT));
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue211Test.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue211Test.php
deleted file mode 100644
index 950629fd813..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue211Test.php
+++ /dev/null
@@ -1,89 +0,0 @@
- 1,
- 'name' => 'Calendar',
- 'principaluri' => 'principals/user1',
- 'uri' => 'calendar1',
- ]
- ];
-
- protected $caldavCalendarObjects = [
- 1 => [
- 'event.ics' => [
- 'calendardata' => 'BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:20120418T172519CEST-3510gh1hVw
-DTSTAMP:20120418T152519Z
-DTSTART;VALUE=DATE:20120330
-DTEND;VALUE=DATE:20120531
-EXDATE;TZID=Europe/Berlin:20120330T000000
-RRULE:FREQ=YEARLY;INTERVAL=1
-SEQUENCE:1
-SUMMARY:Birthday
-TRANSP:TRANSPARENT
-BEGIN:VALARM
-ACTION:EMAIL
-ATTENDEE:MAILTO:xxx@domain.de
-DESCRIPTION:Dies ist eine Kalender Erinnerung
-SUMMARY:Kalender Alarm Erinnerung
-TRIGGER;VALUE=DATE-TIME:20120329T060000Z
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-',
- ],
- ],
- ];
-
- function testIssue211() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_CONTENT_TYPE' => 'application/xml',
- 'REQUEST_URI' => '/calendars/user1/calendar1',
- 'HTTP_DEPTH' => '1',
- ]);
-
- $request->setBody('
-
-
-
-
-
-
-
-
-
-
-
- ');
-
- $response = $this->request($request);
-
- // if this assert is reached, the endless loop is gone
- // There should be no matching events
- $this->assertFalse(strpos('BEGIN:VEVENT', $response->body));
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue220Test.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue220Test.php
deleted file mode 100644
index c3c0b5b48a8..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue220Test.php
+++ /dev/null
@@ -1,99 +0,0 @@
- 1,
- 'name' => 'Calendar',
- 'principaluri' => 'principals/user1',
- 'uri' => 'calendar1',
- ]
- ];
-
- protected $caldavCalendarObjects = [
- 1 => [
- 'event.ics' => [
- 'calendardata' => 'BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-DTSTART;TZID=Europe/Berlin:20120601T180000
-SUMMARY:Brot backen
-RRULE:FREQ=DAILY;INTERVAL=1;WKST=MO
-TRANSP:OPAQUE
-DURATION:PT20M
-LAST-MODIFIED:20120601T064634Z
-CREATED:20120601T064634Z
-DTSTAMP:20120601T064634Z
-UID:b64f14c5-dccc-4eda-947f-bdb1f763fbcd
-BEGIN:VALARM
-TRIGGER;VALUE=DURATION:-PT5M
-ACTION:DISPLAY
-DESCRIPTION:Default Event Notification
-X-WR-ALARMUID:cd952c1b-b3d6-41fb-b0a6-ec3a1a5bdd58
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
-DTSTART;TZID=Europe/Berlin:20120606T180000
-SUMMARY:Brot backen
-TRANSP:OPAQUE
-STATUS:CANCELLED
-DTEND;TZID=Europe/Berlin:20120606T182000
-LAST-MODIFIED:20120605T094310Z
-SEQUENCE:1
-RECURRENCE-ID:20120606T160000Z
-UID:b64f14c5-dccc-4eda-947f-bdb1f763fbcd
-END:VEVENT
-END:VCALENDAR
-',
- ],
- ],
- ];
-
- function testIssue220() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_CONTENT_TYPE' => 'application/xml',
- 'REQUEST_URI' => '/calendars/user1/calendar1',
- 'HTTP_DEPTH' => '1',
- ]);
-
- $request->setBody('
-
-
-
-
-
-
-
-
-
-
-
- ');
-
- $response = $this->request($request);
-
- $this->assertFalse(strpos($response->body, 'PHPUnit_Framework_Error_Warning '), 'Error Warning occurred: ' . $response->body);
- $this->assertFalse(strpos($response->body, 'Invalid argument supplied for foreach()'), 'Invalid argument supplied for foreach(): ' . $response->body);
-
- $this->assertEquals(207, $response->status);
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue228Test.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue228Test.php
deleted file mode 100644
index d0783701de9..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Issue228Test.php
+++ /dev/null
@@ -1,79 +0,0 @@
- 1,
- 'name' => 'Calendar',
- 'principaluri' => 'principals/user1',
- 'uri' => 'calendar1',
- ]
- ];
-
- protected $caldavCalendarObjects = [
- 1 => [
- 'event.ics' => [
- 'calendardata' => 'BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:20120730T113415CEST-6804EGphkd@xxxxxx.de
-DTSTAMP:20120730T093415Z
-DTSTART;VALUE=DATE:20120729
-DTEND;VALUE=DATE:20120730
-SUMMARY:sunday event
-TRANSP:TRANSPARENT
-END:VEVENT
-END:VCALENDAR
-',
- ],
- ],
- ];
-
- function testIssue228() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_CONTENT_TYPE' => 'application/xml',
- 'REQUEST_URI' => '/calendars/user1/calendar1',
- 'HTTP_DEPTH' => '1',
- ]);
-
- $request->setBody('
-
-
-
-
-
-
-
-
-
-
-
- ');
-
- $response = $this->request($request);
-
- // We must check if absolutely nothing was returned from this query.
- $this->assertFalse(strpos($response->body, 'BEGIN:VCALENDAR'));
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/JCalTransformTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/JCalTransformTest.php
deleted file mode 100644
index f1eed177597..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/JCalTransformTest.php
+++ /dev/null
@@ -1,262 +0,0 @@
- 1,
- 'principaluri' => 'principals/user1',
- 'uri' => 'foo',
- ]
- ];
- protected $caldavCalendarObjects = [
- 1 => [
- 'bar.ics' => [
- 'uri' => 'bar.ics',
- 'calendarid' => 1,
- 'calendardata' => "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n",
- 'lastmodified' => null
- ]
- ],
- ];
-
- function testGet() {
-
- $headers = [
- 'Accept' => 'application/calendar+json',
- ];
- $request = new Request('GET', '/calendars/user1/foo/bar.ics', $headers);
-
- $response = $this->request($request);
-
- $body = $response->getBodyAsString();
- $this->assertEquals(200, $response->getStatus(), "Incorrect status code: " . $body);
-
- $response = json_decode($body, true);
- if (json_last_error() !== JSON_ERROR_NONE) {
- $this->fail('Json decoding error: ' . json_last_error_msg());
- }
- $this->assertEquals(
- [
- 'vcalendar',
- [],
- [
- [
- 'vevent',
- [],
- [],
- ],
- ],
- ],
- $response
- );
-
- }
-
- function testMultiGet() {
-
- $xml = <<
-
-
-
- /calendars/user1/foo/bar.ics
-
-XML;
-
- $headers = [];
- $request = new Request('REPORT', '/calendars/user1/foo', $headers, $xml);
-
- $response = $this->request($request);
-
- $this->assertEquals(207, $response->getStatus(), 'Full rsponse: ' . $response->getBodyAsString());
-
- $multiStatus = $this->server->xml->parse(
- $response->getBodyAsString()
- );
-
- $responses = $multiStatus->getResponses();
- $this->assertEquals(1, count($responses));
-
- $response = $responses[0]->getResponseProperties()[200]["{urn:ietf:params:xml:ns:caldav}calendar-data"];
-
- $jresponse = json_decode($response, true);
- if (json_last_error()) {
- $this->fail('Json decoding error: ' . json_last_error_msg() . '. Full response: ' . $response);
- }
- $this->assertEquals(
- [
- 'vcalendar',
- [],
- [
- [
- 'vevent',
- [],
- [],
- ],
- ],
- ],
- $jresponse
- );
-
- }
-
- function testCalendarQueryDepth1() {
-
- $xml = <<
-
-
-
-
-
-
-XML;
-
- $headers = [
- 'Depth' => '1',
- ];
- $request = new Request('REPORT', '/calendars/user1/foo', $headers, $xml);
-
- $response = $this->request($request);
-
- $this->assertEquals(207, $response->getStatus(), "Invalid response code. Full body: " . $response->getBodyAsString());
-
- $multiStatus = $this->server->xml->parse(
- $response->getBodyAsString()
- );
-
- $responses = $multiStatus->getResponses();
-
- $this->assertEquals(1, count($responses));
-
- $response = $responses[0]->getResponseProperties()[200]["{urn:ietf:params:xml:ns:caldav}calendar-data"];
- $response = json_decode($response, true);
- if (json_last_error()) {
- $this->fail('Json decoding error: ' . json_last_error_msg());
- }
- $this->assertEquals(
- [
- 'vcalendar',
- [],
- [
- [
- 'vevent',
- [],
- [],
- ],
- ],
- ],
- $response
- );
-
- }
-
- function testCalendarQueryDepth0() {
-
- $xml = <<
-
-
-
-
-
-
-XML;
-
- $headers = [
- 'Depth' => '0',
- ];
- $request = new Request('REPORT', '/calendars/user1/foo/bar.ics', $headers, $xml);
-
- $response = $this->request($request);
-
- $this->assertEquals(207, $response->getStatus(), "Invalid response code. Full body: " . $response->getBodyAsString());
-
- $multiStatus = $this->server->xml->parse(
- $response->getBodyAsString()
- );
-
- $responses = $multiStatus->getResponses();
-
- $this->assertEquals(1, count($responses));
-
- $response = $responses[0]->getResponseProperties()[200]["{urn:ietf:params:xml:ns:caldav}calendar-data"];
- $response = json_decode($response, true);
- if (json_last_error()) {
- $this->fail('Json decoding error: ' . json_last_error_msg());
- }
- $this->assertEquals(
- [
- 'vcalendar',
- [],
- [
- [
- 'vevent',
- [],
- [],
- ],
- ],
- ],
- $response
- );
-
- }
-
- function testValidateICalendar() {
-
- $input = [
- 'vcalendar',
- [],
- [
- [
- 'vevent',
- [
- ['uid', (object)[], 'text', 'foo'],
- ['dtstart', (object)[], 'date', '2016-04-06'],
- ],
- [],
- ],
- ],
- ];
- $input = json_encode($input);
- $this->caldavPlugin->beforeWriteContent(
- 'calendars/user1/foo/bar.ics',
- $this->server->tree->getNodeForPath('calendars/user1/foo/bar.ics'),
- $input,
- $modified
- );
-
-
- $expected = <<assertVObjectEqualsVObject(
- $expected,
- $input
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Notifications/CollectionTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Notifications/CollectionTest.php
deleted file mode 100644
index 6585f85c379..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Notifications/CollectionTest.php
+++ /dev/null
@@ -1,85 +0,0 @@
-principalUri = 'principals/user1';
-
- $this->notification = new CalDAV\Xml\Notification\SystemStatus(1, '"1"');
-
- $this->caldavBackend = new CalDAV\Backend\MockSharing([], [], [
- 'principals/user1' => [
- $this->notification
- ]
- ]);
-
- return new Collection($this->caldavBackend, $this->principalUri);
-
- }
-
- function testGetChildren() {
-
- $col = $this->getInstance();
- $this->assertEquals('notifications', $col->getName());
-
- $this->assertEquals([
- new Node($this->caldavBackend, $this->principalUri, $this->notification)
- ], $col->getChildren());
-
- }
-
- function testGetOwner() {
-
- $col = $this->getInstance();
- $this->assertEquals('principals/user1', $col->getOwner());
-
- }
-
- function testGetGroup() {
-
- $col = $this->getInstance();
- $this->assertNull($col->getGroup());
-
- }
-
- function testGetACL() {
-
- $col = $this->getInstance();
- $expected = [
- [
- 'privilege' => '{DAV:}all',
- 'principal' => '{DAV:}owner',
- 'protected' => true,
- ],
- ];
-
- $this->assertEquals($expected, $col->getACL());
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\Forbidden
- */
- function testSetACL() {
-
- $col = $this->getInstance();
- $col->setACL([]);
-
- }
-
- function testGetSupportedPrivilegeSet() {
-
- $col = $this->getInstance();
- $this->assertNull($col->getSupportedPrivilegeSet());
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Notifications/NodeTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Notifications/NodeTest.php
deleted file mode 100644
index 6c6e02da81a..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Notifications/NodeTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
-systemStatus = new CalDAV\Xml\Notification\SystemStatus(1, '"1"');
-
- $this->caldavBackend = new CalDAV\Backend\MockSharing([], [], [
- 'principals/user1' => [
- $this->systemStatus
- ]
- ]);
-
- $node = new Node($this->caldavBackend, 'principals/user1', $this->systemStatus);
- return $node;
-
- }
-
- function testGetId() {
-
- $node = $this->getInstance();
- $this->assertEquals($this->systemStatus->getId() . '.xml', $node->getName());
-
- }
-
- function testGetEtag() {
-
- $node = $this->getInstance();
- $this->assertEquals('"1"', $node->getETag());
-
- }
-
- function testGetNotificationType() {
-
- $node = $this->getInstance();
- $this->assertEquals($this->systemStatus, $node->getNotificationType());
-
- }
-
- function testDelete() {
-
- $node = $this->getInstance();
- $node->delete();
- $this->assertEquals([], $this->caldavBackend->getNotificationsForPrincipal('principals/user1'));
-
- }
-
- function testGetGroup() {
-
- $node = $this->getInstance();
- $this->assertNull($node->getGroup());
-
- }
-
- function testGetACL() {
-
- $node = $this->getInstance();
- $expected = [
- [
- 'privilege' => '{DAV:}all',
- 'principal' => '{DAV:}owner',
- 'protected' => true,
- ],
- ];
-
- $this->assertEquals($expected, $node->getACL());
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\Forbidden
- */
- function testSetACL() {
-
- $node = $this->getInstance();
- $node->setACL([]);
-
- }
-
- function testGetSupportedPrivilegeSet() {
-
- $node = $this->getInstance();
- $this->assertNull($node->getSupportedPrivilegeSet());
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Notifications/PluginTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Notifications/PluginTest.php
deleted file mode 100644
index 73f256c98e7..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Notifications/PluginTest.php
+++ /dev/null
@@ -1,168 +0,0 @@
-caldavBackend = new CalDAV\Backend\MockSharing();
- $principalBackend = new DAVACL\PrincipalBackend\Mock();
- $calendars = new CalDAV\CalendarRoot($principalBackend, $this->caldavBackend);
- $principals = new CalDAV\Principal\Collection($principalBackend);
-
- $root = new DAV\SimpleCollection('root');
- $root->addChild($calendars);
- $root->addChild($principals);
-
- $this->server = new DAV\Server($root);
- $this->server->sapi = new HTTP\SapiMock();
- $this->server->debugExceptions = true;
- $this->server->setBaseUri('/');
- $this->plugin = new Plugin();
- $this->server->addPlugin($this->plugin);
-
-
- // Adding ACL plugin
- $aclPlugin = new DAVACL\Plugin();
- $aclPlugin->allowUnauthenticatedAccess = false;
- $this->server->addPlugin($aclPlugin);
-
- // CalDAV is also required.
- $this->server->addPlugin(new CalDAV\Plugin());
- // Adding Auth plugin, and ensuring that we are logged in.
- $authBackend = new DAV\Auth\Backend\Mock();
- $authPlugin = new DAV\Auth\Plugin($authBackend);
- $this->server->addPlugin($authPlugin);
-
- // This forces a login
- $authPlugin->beforeMethod(new HTTP\Request(), new HTTP\Response());
-
- $this->response = new HTTP\ResponseMock();
- $this->server->httpResponse = $this->response;
-
- }
-
- function testSimple() {
-
- $this->assertEquals([], $this->plugin->getFeatures());
- $this->assertEquals('notifications', $this->plugin->getPluginName());
- $this->assertEquals(
- 'notifications',
- $this->plugin->getPluginInfo()['name']
- );
-
- }
-
- function testPrincipalProperties() {
-
- $httpRequest = new Request('GET', '/', ['Host' => 'sabredav.org']);
- $this->server->httpRequest = $httpRequest;
-
- $props = $this->server->getPropertiesForPath('principals/admin', [
- '{' . Plugin::NS_CALENDARSERVER . '}notification-URL',
- ]);
-
- $this->assertArrayHasKey(0, $props);
- $this->assertArrayHasKey(200, $props[0]);
-
- $this->assertArrayHasKey('{' . Plugin::NS_CALENDARSERVER . '}notification-URL', $props[0][200]);
- $prop = $props[0][200]['{' . Plugin::NS_CALENDARSERVER . '}notification-URL'];
- $this->assertTrue($prop instanceof DAV\Xml\Property\Href);
- $this->assertEquals('calendars/admin/notifications/', $prop->getHref());
-
- }
-
- function testNotificationProperties() {
-
- $notification = new Node(
- $this->caldavBackend,
- 'principals/user1',
- new SystemStatus('foo', '"1"')
- );
- $propFind = new DAV\PropFind('calendars/user1/notifications', [
- '{' . Plugin::NS_CALENDARSERVER . '}notificationtype',
- ]);
-
- $this->plugin->propFind($propFind, $notification);
-
- $this->assertEquals(
- $notification->getNotificationType(),
- $propFind->get('{' . Plugin::NS_CALENDARSERVER . '}notificationtype')
- );
-
- }
-
- function testNotificationGet() {
-
- $notification = new Node(
- $this->caldavBackend,
- 'principals/user1',
- new SystemStatus('foo', '"1"')
- );
-
- $server = new DAV\Server([$notification]);
- $caldav = new Plugin();
-
- $server->httpRequest = new Request('GET', '/foo.xml');
- $httpResponse = new HTTP\ResponseMock();
- $server->httpResponse = $httpResponse;
-
- $server->addPlugin($caldav);
-
- $caldav->httpGet($server->httpRequest, $server->httpResponse);
-
- $this->assertEquals(200, $httpResponse->status);
- $this->assertEquals([
- 'Content-Type' => ['application/xml'],
- 'ETag' => ['"1"'],
- ], $httpResponse->getHeaders());
-
- $expected =
-'
-
-
-';
-
- $this->assertXmlStringEqualsXmlString($expected, $httpResponse->getBodyAsString());
-
- }
-
- function testGETPassthrough() {
-
- $server = new DAV\Server();
- $caldav = new Plugin();
-
- $httpResponse = new HTTP\ResponseMock();
- $server->httpResponse = $httpResponse;
-
- $server->addPlugin($caldav);
-
- $this->assertNull($caldav->httpGet(new HTTP\Request('GET', '/foozz'), $server->httpResponse));
-
- }
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/PluginTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/PluginTest.php
deleted file mode 100644
index 859f6aa0c4e..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/PluginTest.php
+++ /dev/null
@@ -1,1086 +0,0 @@
-caldavBackend = new Backend\Mock([
- [
- 'id' => 1,
- 'uri' => 'UUID-123467',
- 'principaluri' => 'principals/user1',
- '{DAV:}displayname' => 'user1 calendar',
- $caldavNS . 'calendar-description' => 'Calendar description',
- '{http://apple.com/ns/ical/}calendar-order' => '1',
- '{http://apple.com/ns/ical/}calendar-color' => '#FF0000',
- $caldavNS . 'supported-calendar-component-set' => new Xml\Property\SupportedCalendarComponentSet(['VEVENT', 'VTODO']),
- ],
- [
- 'id' => 2,
- 'uri' => 'UUID-123468',
- 'principaluri' => 'principals/user1',
- '{DAV:}displayname' => 'user1 calendar2',
- $caldavNS . 'calendar-description' => 'Calendar description',
- '{http://apple.com/ns/ical/}calendar-order' => '1',
- '{http://apple.com/ns/ical/}calendar-color' => '#FF0000',
- $caldavNS . 'supported-calendar-component-set' => new Xml\Property\SupportedCalendarComponentSet(['VEVENT', 'VTODO']),
- ]
- ], [
- 1 => [
- 'UUID-2345' => [
- 'calendardata' => TestUtil::getTestCalendarData(),
- ]
- ]
- ]);
- $principalBackend = new DAVACL\PrincipalBackend\Mock();
- $principalBackend->setGroupMemberSet('principals/admin/calendar-proxy-read', ['principals/user1']);
- $principalBackend->setGroupMemberSet('principals/admin/calendar-proxy-write', ['principals/user1']);
- $principalBackend->addPrincipal([
- 'uri' => 'principals/admin/calendar-proxy-read',
- ]);
- $principalBackend->addPrincipal([
- 'uri' => 'principals/admin/calendar-proxy-write',
- ]);
-
- $calendars = new CalendarRoot($principalBackend, $this->caldavBackend);
- $principals = new Principal\Collection($principalBackend);
-
- $root = new DAV\SimpleCollection('root');
- $root->addChild($calendars);
- $root->addChild($principals);
-
- $this->server = new DAV\Server($root);
- $this->server->sapi = new HTTP\SapiMock();
- $this->server->debugExceptions = true;
- $this->server->setBaseUri('/');
- $this->plugin = new Plugin();
- $this->server->addPlugin($this->plugin);
-
- // Adding ACL plugin
- $aclPlugin = new DAVACL\Plugin();
- $aclPlugin->allowUnauthenticatedAccess = false;
- $this->server->addPlugin($aclPlugin);
-
- // Adding Auth plugin, and ensuring that we are logged in.
- $authBackend = new DAV\Auth\Backend\Mock();
- $authBackend->setPrincipal('principals/user1');
- $authPlugin = new DAV\Auth\Plugin($authBackend);
- $authPlugin->beforeMethod(new \Sabre\HTTP\Request(), new \Sabre\HTTP\Response());
- $this->server->addPlugin($authPlugin);
-
- // This forces a login
- $authPlugin->beforeMethod(new HTTP\Request(), new HTTP\Response());
-
- $this->response = new HTTP\ResponseMock();
- $this->server->httpResponse = $this->response;
-
- }
-
- function testSimple() {
-
- $this->assertEquals(['MKCALENDAR'], $this->plugin->getHTTPMethods('calendars/user1/randomnewcalendar'));
- $this->assertEquals(['calendar-access', 'calendar-proxy'], $this->plugin->getFeatures());
- $this->assertEquals(
- 'caldav',
- $this->plugin->getPluginInfo()['name']
- );
-
- }
-
- function testUnknownMethodPassThrough() {
-
- $request = new HTTP\Request('MKBREAKFAST', '/');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(501, $this->response->status, 'Incorrect status returned. Full response body:' . $this->response->body);
-
- }
-
- function testReportPassThrough() {
-
- $request = new HTTP\Request('REPORT', '/', ['Content-Type' => 'application/xml']);
- $request->setBody('
-
-
- Lisa\'s Events
- Calendar restricted to events.
-
-
-
-
- ';
-
- $request->setBody($body);
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(403, $this->response->status);
-
- }
-
- function testMkCalendarNoParentNode() {
-
- $request = new HTTP\Request('MKCALENDAR', '/doesntexist/calendar');
-
- $body = '
-
-
-
- Lisa\'s Events
- Calendar restricted to events.
-
-
-
-
- ';
-
- $request->setBody($body);
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(409, $this->response->status);
-
- }
-
- function testMkCalendarExistingCalendar() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'MKCALENDAR',
- 'REQUEST_URI' => '/calendars/user1/UUID-123467',
- ]);
-
- $body = '
-
-
-
- Lisa\'s Events
- Calendar restricted to events.
-
-
-
-
- ';
-
- $request->setBody($body);
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(405, $this->response->status);
-
- }
-
- function testMkCalendarSucceed() {
-
- $request = new HTTP\Request('MKCALENDAR', '/calendars/user1/NEWCALENDAR');
-
- $timezone = 'BEGIN:VCALENDAR
-PRODID:-//Example Corp.//CalDAV Client//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:US-Eastern
-LAST-MODIFIED:19870101T000000Z
-BEGIN:STANDARD
-DTSTART:19671029T020000
-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:Eastern Standard Time (US & Canada)
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:19870405T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:Eastern Daylight Time (US & Canada)
-END:DAYLIGHT
-END:VTIMEZONE
-END:VCALENDAR';
-
- $body = '
-
-
-
- Lisa\'s Events
- Calendar restricted to events.
-
-
-
-
- ';
-
- $request->setBody($body);
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(201, $this->response->status, 'Invalid response code received. Full response body: ' . $this->response->body);
-
- $calendars = $this->caldavBackend->getCalendarsForUser('principals/user1');
- $this->assertEquals(3, count($calendars));
-
- $newCalendar = null;
- foreach ($calendars as $calendar) {
- if ($calendar['uri'] === 'NEWCALENDAR') {
- $newCalendar = $calendar;
- break;
- }
- }
-
- $this->assertInternalType('array', $newCalendar);
-
- $keys = [
- 'uri' => 'NEWCALENDAR',
- 'id' => null,
- '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'Calendar restricted to events.',
- '{urn:ietf:params:xml:ns:caldav}calendar-timezone' => $timezone,
- '{DAV:}displayname' => 'Lisa\'s Events',
- '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set' => null,
- ];
-
- foreach ($keys as $key => $value) {
-
- $this->assertArrayHasKey($key, $newCalendar);
-
- if (is_null($value)) continue;
- $this->assertEquals($value, $newCalendar[$key]);
-
- }
- $sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
- $this->assertTrue($newCalendar[$sccs] instanceof Xml\Property\SupportedCalendarComponentSet);
- $this->assertEquals(['VEVENT'], $newCalendar[$sccs]->getValue());
-
- }
-
- function testMkCalendarEmptyBodySucceed() {
-
- $request = new HTTP\Request('MKCALENDAR', '/calendars/user1/NEWCALENDAR');
-
- $request->setBody('');
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(201, $this->response->status, 'Invalid response code received. Full response body: ' . $this->response->body);
-
- $calendars = $this->caldavBackend->getCalendarsForUser('principals/user1');
- $this->assertEquals(3, count($calendars));
-
- $newCalendar = null;
- foreach ($calendars as $calendar) {
- if ($calendar['uri'] === 'NEWCALENDAR') {
- $newCalendar = $calendar;
- break;
- }
- }
-
- $this->assertInternalType('array', $newCalendar);
-
- $keys = [
- 'uri' => 'NEWCALENDAR',
- 'id' => null,
- '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set' => null,
- ];
-
- foreach ($keys as $key => $value) {
-
- $this->assertArrayHasKey($key, $newCalendar);
-
- if (is_null($value)) continue;
- $this->assertEquals($value, $newCalendar[$key]);
-
- }
- $sccs = '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set';
- $this->assertTrue($newCalendar[$sccs] instanceof Xml\Property\SupportedCalendarComponentSet);
- $this->assertEquals(['VEVENT', 'VTODO'], $newCalendar[$sccs]->getValue());
-
- }
-
- function testMkCalendarBadXml() {
-
- $request = new HTTP\Request('MKCALENDAR', '/blabla');
- $body = 'This is not xml';
-
- $request->setBody($body);
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(400, $this->response->status);
-
- }
-
- function testPrincipalProperties() {
-
- $httpRequest = new HTTP\Request('FOO', '/blabla', ['Host' => 'sabredav.org']);
- $this->server->httpRequest = $httpRequest;
-
- $props = $this->server->getPropertiesForPath('/principals/user1', [
- '{' . Plugin::NS_CALDAV . '}calendar-home-set',
- '{' . Plugin::NS_CALENDARSERVER . '}calendar-proxy-read-for',
- '{' . Plugin::NS_CALENDARSERVER . '}calendar-proxy-write-for',
- '{' . Plugin::NS_CALENDARSERVER . '}notification-URL',
- '{' . Plugin::NS_CALENDARSERVER . '}email-address-set',
- ]);
-
- $this->assertArrayHasKey(0, $props);
- $this->assertArrayHasKey(200, $props[0]);
-
-
- $this->assertArrayHasKey('{urn:ietf:params:xml:ns:caldav}calendar-home-set', $props[0][200]);
- $prop = $props[0][200]['{urn:ietf:params:xml:ns:caldav}calendar-home-set'];
- $this->assertInstanceOf('Sabre\\DAV\\Xml\\Property\\Href', $prop);
- $this->assertEquals('calendars/user1/', $prop->getHref());
-
- $this->assertArrayHasKey('{http://calendarserver.org/ns/}calendar-proxy-read-for', $props[0][200]);
- $prop = $props[0][200]['{http://calendarserver.org/ns/}calendar-proxy-read-for'];
- $this->assertInstanceOf('Sabre\\DAV\\Xml\\Property\\Href', $prop);
- $this->assertEquals(['principals/admin/'], $prop->getHrefs());
-
- $this->assertArrayHasKey('{http://calendarserver.org/ns/}calendar-proxy-write-for', $props[0][200]);
- $prop = $props[0][200]['{http://calendarserver.org/ns/}calendar-proxy-write-for'];
- $this->assertInstanceOf('Sabre\\DAV\\Xml\\Property\\Href', $prop);
- $this->assertEquals(['principals/admin/'], $prop->getHrefs());
-
- $this->assertArrayHasKey('{' . Plugin::NS_CALENDARSERVER . '}email-address-set', $props[0][200]);
- $prop = $props[0][200]['{' . Plugin::NS_CALENDARSERVER . '}email-address-set'];
- $this->assertInstanceOf('Sabre\\CalDAV\\Xml\\Property\\EmailAddressSet', $prop);
- $this->assertEquals(['user1.sabredav@sabredav.org'], $prop->getValue());
-
- }
-
- function testSupportedReportSetPropertyNonCalendar() {
-
- $props = $this->server->getPropertiesForPath('/calendars/user1', [
- '{DAV:}supported-report-set',
- ]);
-
- $this->assertArrayHasKey(0, $props);
- $this->assertArrayHasKey(200, $props[0]);
- $this->assertArrayHasKey('{DAV:}supported-report-set', $props[0][200]);
-
- $prop = $props[0][200]['{DAV:}supported-report-set'];
-
- $this->assertInstanceOf('\\Sabre\\DAV\\Xml\\Property\\SupportedReportSet', $prop);
- $value = [
- '{DAV:}expand-property',
- '{DAV:}principal-match',
- '{DAV:}principal-property-search',
- '{DAV:}principal-search-property-set',
- ];
- $this->assertEquals($value, $prop->getValue());
-
- }
-
- /**
- * @depends testSupportedReportSetPropertyNonCalendar
- */
- function testSupportedReportSetProperty() {
-
- $props = $this->server->getPropertiesForPath('/calendars/user1/UUID-123467', [
- '{DAV:}supported-report-set',
- ]);
-
- $this->assertArrayHasKey(0, $props);
- $this->assertArrayHasKey(200, $props[0]);
- $this->assertArrayHasKey('{DAV:}supported-report-set', $props[0][200]);
-
- $prop = $props[0][200]['{DAV:}supported-report-set'];
-
- $this->assertInstanceOf('\\Sabre\\DAV\\Xml\\Property\\SupportedReportSet', $prop);
- $value = [
- '{urn:ietf:params:xml:ns:caldav}calendar-multiget',
- '{urn:ietf:params:xml:ns:caldav}calendar-query',
- '{urn:ietf:params:xml:ns:caldav}free-busy-query',
- '{DAV:}expand-property',
- '{DAV:}principal-match',
- '{DAV:}principal-property-search',
- '{DAV:}principal-search-property-set'
- ];
- $this->assertEquals($value, $prop->getValue());
-
- }
-
- function testSupportedReportSetUserCalendars() {
-
- $this->server->addPlugin(new \Sabre\DAV\Sync\Plugin());
-
- $props = $this->server->getPropertiesForPath('/calendars/user1', [
- '{DAV:}supported-report-set',
- ]);
-
- $this->assertArrayHasKey(0, $props);
- $this->assertArrayHasKey(200, $props[0]);
- $this->assertArrayHasKey('{DAV:}supported-report-set', $props[0][200]);
-
- $prop = $props[0][200]['{DAV:}supported-report-set'];
-
- $this->assertInstanceOf('\\Sabre\\DAV\\Xml\\Property\\SupportedReportSet', $prop);
- $value = [
- '{DAV:}sync-collection',
- '{DAV:}expand-property',
- '{DAV:}principal-match',
- '{DAV:}principal-property-search',
- '{DAV:}principal-search-property-set',
- ];
- $this->assertEquals($value, $prop->getValue());
-
- }
-
- /**
- * @depends testSupportedReportSetProperty
- */
- function testCalendarMultiGetReport() {
-
- $body =
- '' .
- '' .
- '' .
- ' ' .
- '/calendars/user1/UUID-123467/UUID-2345 ' .
- ' ';
-
- $request = new HTTP\Request('REPORT', '/calendars/user1', ['Depth' => '1']);
- $request->setBody($body);
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(207, $this->response->status, 'Invalid HTTP status received. Full response body');
-
- $expectedIcal = TestUtil::getTestCalendarData();
-
- $expected = <<
-
-
- /calendars/user1/UUID-123467/UUID-2345
-
-
- $expectedIcal
- "e207e33c10e5fb9c12cfb35b5d9116e1"
-
- HTTP/1.1 200 OK
-
-
-
-XML;
-
- $this->assertXmlStringEqualsXmlString($expected, $this->response->getBodyAsString());
-
- }
-
- /**
- * @depends testCalendarMultiGetReport
- */
- function testCalendarMultiGetReportExpand() {
-
- $body =
- '' .
- '' .
- '' .
- ' ' .
- ' ' .
- ' ' .
- '/calendars/user1/UUID-123467/UUID-2345 ' .
- ' ';
-
- $request = new HTTP\Request('REPORT', '/calendars/user1', ['Depth' => '1']);
- $request->setBody($body);
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(207, $this->response->status, 'Invalid HTTP status received. Full response body: ' . $this->response->body);
-
- $expectedIcal = TestUtil::getTestCalendarData();
- $expectedIcal = \Sabre\VObject\Reader::read($expectedIcal);
- $expectedIcal = $expectedIcal->expand(
- new DateTime('2011-01-01 00:00:00', new DateTimeZone('UTC')),
- new DateTime('2011-12-31 23:59:59', new DateTimeZone('UTC'))
- );
- $expectedIcal = str_replace("\r\n", "
\n", $expectedIcal->serialize());
-
- $expected = <<
-
-
- /calendars/user1/UUID-123467/UUID-2345
-
-
- $expectedIcal
- "e207e33c10e5fb9c12cfb35b5d9116e1"
-
- HTTP/1.1 200 OK
-
-
-
-XML;
-
- $this->assertXmlStringEqualsXmlString($expected, $this->response->getBodyAsString());
-
- }
-
- /**
- * @depends testSupportedReportSetProperty
- * @depends testCalendarMultiGetReport
- */
- function testCalendarQueryReport() {
-
- $body =
- '' .
- '' .
- '' .
- ' ' .
- ' ' .
- ' ' .
- '' .
- ' ' .
- ' ' .
- ' ' .
- ' ';
-
- $request = new HTTP\Request('REPORT', '/calendars/user1/UUID-123467', ['Depth' => '1']);
- $request->setBody($body);
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(207, $this->response->status, 'Received an unexpected status. Full response body: ' . $this->response->body);
-
- $expectedIcal = TestUtil::getTestCalendarData();
- $expectedIcal = \Sabre\VObject\Reader::read($expectedIcal);
- $expectedIcal = $expectedIcal->expand(
- new DateTime('2000-01-01 00:00:00', new DateTimeZone('UTC')),
- new DateTime('2010-12-31 23:59:59', new DateTimeZone('UTC'))
- );
- $expectedIcal = str_replace("\r\n", "
\n", $expectedIcal->serialize());
-
- $expected = <<
-
-
- /calendars/user1/UUID-123467/UUID-2345
-
-
- $expectedIcal
- "e207e33c10e5fb9c12cfb35b5d9116e1"
-
- HTTP/1.1 200 OK
-
-
-
-XML;
-
- $this->assertXmlStringEqualsXmlString($expected, $this->response->getBodyAsString());
-
- }
-
- /**
- * @depends testSupportedReportSetProperty
- * @depends testCalendarMultiGetReport
- */
- function testCalendarQueryReportWindowsPhone() {
-
- $body =
- '' .
- '' .
- '' .
- ' ' .
- ' ' .
- ' ' .
- '' .
- ' ' .
- ' ' .
- ' ' .
- ' ';
-
- $request = new HTTP\Request('REPORT', '/calendars/user1/UUID-123467', [
- 'Depth' => '0',
- 'User-Agent' => 'MSFT-WP/8.10.14219 (gzip)',
- ]);
-
- $request->setBody($body);
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(207, $this->response->status, 'Received an unexpected status. Full response body: ' . $this->response->body);
-
- $expectedIcal = TestUtil::getTestCalendarData();
- $expectedIcal = \Sabre\VObject\Reader::read($expectedIcal);
- $expectedIcal = $expectedIcal->expand(
- new DateTime('2000-01-01 00:00:00', new DateTimeZone('UTC')),
- new DateTime('2010-12-31 23:59:59', new DateTimeZone('UTC'))
- );
- $expectedIcal = str_replace("\r\n", "
\n", $expectedIcal->serialize());
-
- $expected = <<
-
-
- /calendars/user1/UUID-123467/UUID-2345
-
-
- $expectedIcal
- "e207e33c10e5fb9c12cfb35b5d9116e1"
-
- HTTP/1.1 200 OK
-
-
-
-XML;
-
- $this->assertXmlStringEqualsXmlString($expected, $this->response->getBodyAsString());
-
- }
-
- /**
- * @depends testSupportedReportSetProperty
- * @depends testCalendarMultiGetReport
- */
- function testCalendarQueryReportBadDepth() {
-
- $body =
- '' .
- '' .
- '' .
- ' ' .
- ' ' .
- ' ' .
- '' .
- ' ' .
- ' ' .
- ' ' .
- ' ';
-
- $request = new HTTP\Request('REPORT', '/calendars/user1/UUID-123467', [
- 'Depth' => '0',
- ]);
- $request->setBody($body);
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(400, $this->response->status, 'Received an unexpected status. Full response body: ' . $this->response->body);
-
- }
-
- /**
- * @depends testCalendarQueryReport
- */
- function testCalendarQueryReportNoCalData() {
-
- $body =
- '' .
- '' .
- '' .
- ' ' .
- '' .
- ' ' .
- ' ' .
- ' ' .
- ' ';
-
- $request = new HTTP\Request('REPORT', '/calendars/user1/UUID-123467', [
- 'Depth' => '1',
- ]);
- $request->setBody($body);
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(207, $this->response->status, 'Received an unexpected status. Full response body: ' . $this->response->body);
-
- $expected = <<
-
-
- /calendars/user1/UUID-123467/UUID-2345
-
-
- "e207e33c10e5fb9c12cfb35b5d9116e1"
-
- HTTP/1.1 200 OK
-
-
-
-XML;
-
- $this->assertXmlStringEqualsXmlString($expected, $this->response->getBodyAsString());
-
- }
-
- /**
- * @depends testCalendarQueryReport
- */
- function testCalendarQueryReportNoFilters() {
-
- $body =
- '' .
- '' .
- '' .
- ' ' .
- ' ';
-
- $request = new HTTP\Request('REPORT', '/calendars/user1/UUID-123467');
- $request->setBody($body);
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(400, $this->response->status, 'Received an unexpected status. Full response body: ' . $this->response->body);
-
- }
-
- /**
- * @depends testSupportedReportSetProperty
- * @depends testCalendarMultiGetReport
- */
- function testCalendarQueryReport1Object() {
-
- $body =
- '' .
- '' .
- '' .
- ' ' .
- ' ' .
- ' ' .
- '' .
- ' ' .
- ' ' .
- ' ' .
- ' ';
-
- $request = new HTTP\Request('REPORT', '/calendars/user1/UUID-123467/UUID-2345', ['Depth' => '0']);
- $request->setBody($body);
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(207, $this->response->status, 'Received an unexpected status. Full response body: ' . $this->response->body);
-
- $expectedIcal = TestUtil::getTestCalendarData();
- $expectedIcal = \Sabre\VObject\Reader::read($expectedIcal);
- $expectedIcal = $expectedIcal->expand(
- new DateTime('2000-01-01 00:00:00', new DateTimeZone('UTC')),
- new DateTime('2010-12-31 23:59:59', new DateTimeZone('UTC'))
- );
- $expectedIcal = str_replace("\r\n", "
\n", $expectedIcal->serialize());
-
- $expected = <<
-
-
- /calendars/user1/UUID-123467/UUID-2345
-
-
- $expectedIcal
- "e207e33c10e5fb9c12cfb35b5d9116e1"
-
- HTTP/1.1 200 OK
-
-
-
-XML;
-
- $this->assertXmlStringEqualsXmlString($expected, $this->response->getBodyAsString());
-
- }
-
- /**
- * @depends testSupportedReportSetProperty
- * @depends testCalendarMultiGetReport
- */
- function testCalendarQueryReport1ObjectNoCalData() {
-
- $body =
- '' .
- '' .
- '' .
- ' ' .
- '' .
- ' ' .
- ' ' .
- ' ' .
- ' ';
-
- $request = new HTTP\Request('REPORT', '/calendars/user1/UUID-123467/UUID-2345', ['Depth' => '0']);
- $request->setBody($body);
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(207, $this->response->status, 'Received an unexpected status. Full response body: ' . $this->response->body);
-
- $expected = <<
-
-
- /calendars/user1/UUID-123467/UUID-2345
-
-
- "e207e33c10e5fb9c12cfb35b5d9116e1"
-
- HTTP/1.1 200 OK
-
-
-
-XML;
-
- $this->assertXmlStringEqualsXmlString($expected, $this->response->getBodyAsString());
-
- }
-
- function testHTMLActionsPanel() {
-
- $output = '';
- $r = $this->server->emit('onHTMLActionsPanel', [$this->server->tree->getNodeForPath('calendars/user1'), &$output]);
- $this->assertFalse($r);
-
- $this->assertTrue(!!strpos($output, 'Display name'));
-
- }
-
- /**
- * @depends testCalendarMultiGetReport
- */
- function testCalendarMultiGetReportNoEnd() {
-
- $body =
- '' .
- '' .
- '' .
- ' ' .
- ' ' .
- ' ' .
- '/calendars/user1/UUID-123467/UUID-2345 ' .
- ' ';
-
- $request = new HTTP\Request('REPORT', '/calendars/user1', ['Depth' => '1']);
- $request->setBody($body);
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(400, $this->response->status, 'Invalid HTTP status received. Full response body: ' . $this->response->body);
-
- }
-
- /**
- * @depends testCalendarMultiGetReport
- */
- function testCalendarMultiGetReportNoStart() {
-
- $body =
- '' .
- '' .
- '' .
- ' ' .
- ' ' .
- ' ' .
- '/calendars/user1/UUID-123467/UUID-2345 ' .
- ' ';
-
- $request = new HTTP\Request('REPORT', '/calendars/user1', ['Depth' => '1']);
- $request->setBody($body);
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(400, $this->response->status, 'Invalid HTTP status received. Full response body: ' . $this->response->body);
-
- }
-
- /**
- * @depends testCalendarMultiGetReport
- */
- function testCalendarMultiGetReportEndBeforeStart() {
-
- $body =
- '' .
- '' .
- '' .
- ' ' .
- ' ' .
- ' ' .
- '/calendars/user1/UUID-123467/UUID-2345 ' .
- ' ';
-
- $request = new HTTP\Request('REPORT', '/calendars/user1', ['Depth' => '1']);
- $request->setBody($body);
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(400, $this->response->status, 'Invalid HTTP status received. Full response body: ' . $this->response->body);
-
- }
-
- /**
- * @depends testSupportedReportSetPropertyNonCalendar
- */
- function testCalendarProperties() {
-
- $ns = '{urn:ietf:params:xml:ns:caldav}';
- $props = $this->server->getProperties('calendars/user1/UUID-123467', [
- $ns . 'max-resource-size',
- $ns . 'supported-calendar-data',
- $ns . 'supported-collation-set',
- ]);
-
- $this->assertEquals([
- $ns . 'max-resource-size' => 10000000,
- $ns . 'supported-calendar-data' => new Xml\Property\SupportedCalendarData(),
- $ns . 'supported-collation-set' => new Xml\Property\SupportedCollationSet(),
- ], $props);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Principal/CollectionTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Principal/CollectionTest.php
deleted file mode 100644
index 23c2488257f..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Principal/CollectionTest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-getChildForPrincipal([
- 'uri' => 'principals/admin',
- ]);
- $this->assertInstanceOf('Sabre\\CalDAV\\Principal\\User', $r);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
deleted file mode 100644
index fe07f013108..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyReadTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
- 'principal/user',
- ]);
- $this->backend = $backend;
- return $principal;
-
- }
-
- function testGetName() {
-
- $i = $this->getInstance();
- $this->assertEquals('calendar-proxy-read', $i->getName());
-
- }
- function testGetDisplayName() {
-
- $i = $this->getInstance();
- $this->assertEquals('calendar-proxy-read', $i->getDisplayName());
-
- }
-
- function testGetLastModified() {
-
- $i = $this->getInstance();
- $this->assertNull($i->getLastModified());
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\Forbidden
- */
- function testDelete() {
-
- $i = $this->getInstance();
- $i->delete();
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\Forbidden
- */
- function testSetName() {
-
- $i = $this->getInstance();
- $i->setName('foo');
-
- }
-
- function testGetAlternateUriSet() {
-
- $i = $this->getInstance();
- $this->assertEquals([], $i->getAlternateUriSet());
-
- }
-
- function testGetPrincipalUri() {
-
- $i = $this->getInstance();
- $this->assertEquals('principal/user/calendar-proxy-read', $i->getPrincipalUrl());
-
- }
-
- function testGetGroupMemberSet() {
-
- $i = $this->getInstance();
- $this->assertEquals([], $i->getGroupMemberSet());
-
- }
-
- function testGetGroupMembership() {
-
- $i = $this->getInstance();
- $this->assertEquals([], $i->getGroupMembership());
-
- }
-
- function testSetGroupMemberSet() {
-
- $i = $this->getInstance();
- $i->setGroupMemberSet(['principals/foo']);
-
- $expected = [
- $i->getPrincipalUrl() => ['principals/foo']
- ];
-
- $this->assertEquals($expected, $this->backend->groupMembers);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php
deleted file mode 100644
index 6cdb9b30e2b..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Principal/ProxyWriteTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
- 'principal/user',
- ]);
- $this->backend = $backend;
- return $principal;
-
- }
-
- function testGetName() {
-
- $i = $this->getInstance();
- $this->assertEquals('calendar-proxy-write', $i->getName());
-
- }
- function testGetDisplayName() {
-
- $i = $this->getInstance();
- $this->assertEquals('calendar-proxy-write', $i->getDisplayName());
-
- }
-
- function testGetPrincipalUri() {
-
- $i = $this->getInstance();
- $this->assertEquals('principal/user/calendar-proxy-write', $i->getPrincipalUrl());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php
deleted file mode 100644
index 420bb3b1afc..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Principal/UserTest.php
+++ /dev/null
@@ -1,127 +0,0 @@
-addPrincipal([
- 'uri' => 'principals/user/calendar-proxy-read',
- ]);
- $backend->addPrincipal([
- 'uri' => 'principals/user/calendar-proxy-write',
- ]);
- $backend->addPrincipal([
- 'uri' => 'principals/user/random',
- ]);
- return new User($backend, [
- 'uri' => 'principals/user',
- ]);
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\Forbidden
- */
- function testCreateFile() {
-
- $u = $this->getInstance();
- $u->createFile('test');
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\Forbidden
- */
- function testCreateDirectory() {
-
- $u = $this->getInstance();
- $u->createDirectory('test');
-
- }
-
- function testGetChildProxyRead() {
-
- $u = $this->getInstance();
- $child = $u->getChild('calendar-proxy-read');
- $this->assertInstanceOf('Sabre\\CalDAV\\Principal\\ProxyRead', $child);
-
- }
-
- function testGetChildProxyWrite() {
-
- $u = $this->getInstance();
- $child = $u->getChild('calendar-proxy-write');
- $this->assertInstanceOf('Sabre\\CalDAV\\Principal\\ProxyWrite', $child);
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\NotFound
- */
- function testGetChildNotFound() {
-
- $u = $this->getInstance();
- $child = $u->getChild('foo');
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\NotFound
- */
- function testGetChildNotFound2() {
-
- $u = $this->getInstance();
- $child = $u->getChild('random');
-
- }
-
- function testGetChildren() {
-
- $u = $this->getInstance();
- $children = $u->getChildren();
- $this->assertEquals(2, count($children));
- $this->assertInstanceOf('Sabre\\CalDAV\\Principal\\ProxyRead', $children[0]);
- $this->assertInstanceOf('Sabre\\CalDAV\\Principal\\ProxyWrite', $children[1]);
-
- }
-
- function testChildExist() {
-
- $u = $this->getInstance();
- $this->assertTrue($u->childExists('calendar-proxy-read'));
- $this->assertTrue($u->childExists('calendar-proxy-write'));
- $this->assertFalse($u->childExists('foo'));
-
- }
-
- function testGetACL() {
-
- $expected = [
- [
- 'privilege' => '{DAV:}all',
- 'principal' => '{DAV:}owner',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user/calendar-proxy-read',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user/calendar-proxy-write',
- 'protected' => true,
- ],
- ];
-
- $u = $this->getInstance();
- $this->assertEquals($expected, $u->getACL());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/DeliverNewEventTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/DeliverNewEventTest.php
deleted file mode 100644
index 79e323f5c32..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/DeliverNewEventTest.php
+++ /dev/null
@@ -1,92 +0,0 @@
-caldavBackend->createCalendar(
- 'principals/user1',
- 'default',
- [
-
- ]
- );
- $this->caldavBackend->createCalendar(
- 'principals/user2',
- 'default',
- [
-
- ]
- );
-
- }
-
- function testDelivery() {
-
- $request = new Request('PUT', '/calendars/user1/default/foo.ics');
- $request->setBody(<<server->on('schedule', function($message) use (&$messages) {
- $messages[] = $message;
- });
-
- $response = $this->request($request);
-
- $this->assertEquals(201, $response->getStatus(), 'Incorrect status code received. Response body:' . $response->getBodyAsString());
-
- $result = $this->request(new Request('GET', '/calendars/user1/default/foo.ics'))->getBody();
- $resultVObj = VObject\Reader::read($result);
-
- $this->assertEquals(
- '1.2',
- $resultVObj->VEVENT->ATTENDEE[1]['SCHEDULE-STATUS']->getValue()
- );
-
- $this->assertEquals(1, count($messages));
- $message = $messages[0];
-
- $this->assertInstanceOf('\Sabre\VObject\ITip\Message', $message);
- $this->assertEquals('mailto:user2.sabredav@sabredav.org', $message->recipient);
- $this->assertEquals('Roxy Kesh', $message->recipientName);
- $this->assertEquals('mailto:user1.sabredav@sabredav.org', $message->sender);
- $this->assertEquals('Administrator', $message->senderName);
- $this->assertEquals('REQUEST', $message->method);
-
- $this->assertEquals('REQUEST', $message->message->METHOD->getValue());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/FreeBusyRequestTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/FreeBusyRequestTest.php
deleted file mode 100644
index 0e0b609a11c..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/FreeBusyRequestTest.php
+++ /dev/null
@@ -1,611 +0,0 @@
- 'principals/user2',
- 'id' => 1,
- 'uri' => 'calendar1',
- $caldavNS . 'calendar-timezone' => "BEGIN:VCALENDAR\r\nBEGIN:VTIMEZONE\r\nTZID:Europe/Berlin\r\nEND:VTIMEZONE\r\nEND:VCALENDAR",
- ],
- [
- 'principaluri' => 'principals/user2',
- 'id' => 2,
- 'uri' => 'calendar2',
- $caldavNS . 'schedule-calendar-transp' => new ScheduleCalendarTransp(ScheduleCalendarTransp::TRANSPARENT),
- ],
- ];
- $calendarobjects = [
- 1 => ['1.ics' => [
- 'uri' => '1.ics',
- 'calendardata' => 'BEGIN:VCALENDAR
-BEGIN:VEVENT
-DTSTART:20110101T130000
-DURATION:PT1H
-END:VEVENT
-END:VCALENDAR',
- 'calendarid' => 1,
- ]],
- 2 => ['2.ics' => [
- 'uri' => '2.ics',
- 'calendardata' => 'BEGIN:VCALENDAR
-BEGIN:VEVENT
-DTSTART:20110101T080000
-DURATION:PT1H
-END:VEVENT
-END:VCALENDAR',
- 'calendarid' => 2,
- ]]
-
- ];
-
- $principalBackend = new DAVACL\PrincipalBackend\Mock();
- $this->caldavBackend = new CalDAV\Backend\MockScheduling($calendars, $calendarobjects);
-
- $tree = [
- new DAVACL\PrincipalCollection($principalBackend),
- new CalDAV\CalendarRoot($principalBackend, $this->caldavBackend),
- ];
-
- $this->request = HTTP\Sapi::createFromServerArray([
- 'CONTENT_TYPE' => 'text/calendar',
- ]);
- $this->response = new HTTP\ResponseMock();
-
- $this->server = new DAV\Server($tree);
- $this->server->httpRequest = $this->request;
- $this->server->httpResponse = $this->response;
-
- $this->aclPlugin = new DAVACL\Plugin();
- $this->aclPlugin->allowUnauthenticatedAccess = false;
- $this->server->addPlugin($this->aclPlugin);
-
- $authBackend = new DAV\Auth\Backend\Mock();
- $authBackend->setPrincipal('principals/user1');
- $this->authPlugin = new DAV\Auth\Plugin($authBackend);
- // Forcing authentication to work.
- $this->authPlugin->beforeMethod($this->request, $this->response);
- $this->server->addPlugin($this->authPlugin);
-
- // CalDAV plugin
- $this->plugin = new CalDAV\Plugin();
- $this->server->addPlugin($this->plugin);
-
- // Scheduling plugin
- $this->plugin = new Plugin();
- $this->server->addPlugin($this->plugin);
-
- }
-
- function testWrongContentType() {
-
- $this->server->httpRequest = new HTTP\Request(
- 'POST',
- '/calendars/user1/outbox',
- ['Content-Type' => 'text/plain']
- );
-
- $this->assertNull(
- $this->plugin->httpPost($this->server->httpRequest, $this->server->httpResponse)
- );
-
- }
-
- function testNotFound() {
-
- $this->server->httpRequest = new HTTP\Request(
- 'POST',
- '/calendars/user1/blabla',
- ['Content-Type' => 'text/calendar']
- );
-
- $this->assertNull(
- $this->plugin->httpPost($this->server->httpRequest, $this->server->httpResponse)
- );
-
- }
-
- function testNotOutbox() {
-
- $this->server->httpRequest = new HTTP\Request(
- 'POST',
- '/calendars/user1/inbox',
- ['Content-Type' => 'text/calendar']
- );
-
- $this->assertNull(
- $this->plugin->httpPost($this->server->httpRequest, $this->server->httpResponse)
- );
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\BadRequest
- */
- function testNoItipMethod() {
-
- $this->server->httpRequest = new HTTP\Request(
- 'POST',
- '/calendars/user1/outbox',
- ['Content-Type' => 'text/calendar']
- );
-
- $body = <<server->httpRequest->setBody($body);
- $this->plugin->httpPost($this->server->httpRequest, $this->server->httpResponse);
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\NotImplemented
- */
- function testNoVFreeBusy() {
-
- $this->server->httpRequest = new HTTP\Request(
- 'POST',
- '/calendars/user1/outbox',
- ['Content-Type' => 'text/calendar']
- );
-
- $body = <<server->httpRequest->setBody($body);
- $this->plugin->httpPost($this->server->httpRequest, $this->server->httpResponse);
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\Forbidden
- */
- function testIncorrectOrganizer() {
-
- $this->server->httpRequest = new HTTP\Request(
- 'POST',
- '/calendars/user1/outbox',
- ['Content-Type' => 'text/calendar']
- );
-
-
- $body = <<server->httpRequest->setBody($body);
- $this->plugin->httpPost($this->server->httpRequest, $this->server->httpResponse);
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\BadRequest
- */
- function testNoAttendees() {
-
- $this->server->httpRequest = new HTTP\Request(
- 'POST',
- '/calendars/user1/outbox',
- ['Content-Type' => 'text/calendar']
- );
-
- $body = <<server->httpRequest->setBody($body);
- $this->plugin->httpPost($this->server->httpRequest, $this->server->httpResponse);
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\BadRequest
- */
- function testNoDTStart() {
-
- $this->server->httpRequest = new HTTP\Request(
- 'POST',
- '/calendars/user1/outbox',
- ['Content-Type' => 'text/calendar']
- );
-
- $body = <<server->httpRequest->setBody($body);
- $this->plugin->httpPost($this->server->httpRequest, $this->server->httpResponse);
-
- }
-
- function testSucceed() {
-
- $this->server->httpRequest = new HTTP\Request(
- 'POST',
- '/calendars/user1/outbox',
- ['Content-Type' => 'text/calendar']
- );
-
- $body = <<server->httpRequest->setBody($body);
-
- // Lazily making the current principal an admin.
- $this->aclPlugin->adminPrincipals[] = 'principals/user1';
-
- $this->assertFalse(
- $this->plugin->httpPost($this->server->httpRequest, $this->response)
- );
-
- $this->assertEquals(200, $this->response->status);
- $this->assertEquals([
- 'Content-Type' => ['application/xml'],
- ], $this->response->getHeaders());
-
- $strings = [
- 'mailto:user2.sabredav@sabredav.org ',
- 'mailto:user3.sabredav@sabredav.org ',
- '2.0;Success ',
- '3.7;Could not find principal ',
- 'FREEBUSY:20110101T120000Z/20110101T130000Z',
- ];
-
- foreach ($strings as $string) {
- $this->assertTrue(
- strpos($this->response->body, $string) !== false,
- 'The response body did not contain: ' . $string . 'Full response: ' . $this->response->body
- );
- }
-
- $this->assertTrue(
- strpos($this->response->body, 'FREEBUSY;FBTYPE=BUSY:20110101T080000Z/20110101T090000Z') == false,
- 'The response body did contain free busy info from a transparent calendar.'
- );
-
- }
-
- /**
- * Testing if the freebusy request still works, even if there are no
- * calendars in the target users' account.
- */
- function testSucceedNoCalendars() {
-
- // Deleting calendars
- $this->caldavBackend->deleteCalendar(1);
- $this->caldavBackend->deleteCalendar(2);
-
- $this->server->httpRequest = new HTTP\Request(
- 'POST',
- '/calendars/user1/outbox',
- ['Content-Type' => 'text/calendar']
- );
-
- $body = <<server->httpRequest->setBody($body);
-
- // Lazily making the current principal an admin.
- $this->aclPlugin->adminPrincipals[] = 'principals/user1';
-
- $this->assertFalse(
- $this->plugin->httpPost($this->server->httpRequest, $this->response)
- );
-
- $this->assertEquals(200, $this->response->status);
- $this->assertEquals([
- 'Content-Type' => ['application/xml'],
- ], $this->response->getHeaders());
-
- $strings = [
- 'mailto:user2.sabredav@sabredav.org ',
- '2.0;Success ',
- ];
-
- foreach ($strings as $string) {
- $this->assertTrue(
- strpos($this->response->body, $string) !== false,
- 'The response body did not contain: ' . $string . 'Full response: ' . $this->response->body
- );
- }
-
- }
-
- function testNoCalendarHomeFound() {
-
- $this->server->httpRequest = new HTTP\Request(
- 'POST',
- '/calendars/user1/outbox',
- ['Content-Type' => 'text/calendar']
- );
-
- $body = <<server->httpRequest->setBody($body);
-
- // Lazily making the current principal an admin.
- $this->aclPlugin->adminPrincipals[] = 'principals/user1';
-
- // Removing the calendar home
- $this->server->on('propFind', function(DAV\PropFind $propFind) {
-
- $propFind->set('{' . Plugin::NS_CALDAV . '}calendar-home-set', null, 403);
-
- });
-
- $this->assertFalse(
- $this->plugin->httpPost($this->server->httpRequest, $this->response)
- );
-
- $this->assertEquals(200, $this->response->status);
- $this->assertEquals([
- 'Content-Type' => ['application/xml'],
- ], $this->response->getHeaders());
-
- $strings = [
- 'mailto:user2.sabredav@sabredav.org ',
- '3.7;No calendar-home-set property found ',
- ];
-
- foreach ($strings as $string) {
- $this->assertTrue(
- strpos($this->response->body, $string) !== false,
- 'The response body did not contain: ' . $string . 'Full response: ' . $this->response->body
- );
- }
-
- }
-
- function testNoInboxFound() {
-
- $this->server->httpRequest = new HTTP\Request(
- 'POST',
- '/calendars/user1/outbox',
- ['Content-Type' => 'text/calendar']
- );
-
- $body = <<server->httpRequest->setBody($body);
-
- // Lazily making the current principal an admin.
- $this->aclPlugin->adminPrincipals[] = 'principals/user1';
-
- // Removing the inbox
- $this->server->on('propFind', function(DAV\PropFind $propFind) {
-
- $propFind->set('{' . Plugin::NS_CALDAV . '}schedule-inbox-URL', null, 403);
-
- });
-
- $this->assertFalse(
- $this->plugin->httpPost($this->server->httpRequest, $this->response)
- );
-
- $this->assertEquals(200, $this->response->status);
- $this->assertEquals([
- 'Content-Type' => ['application/xml'],
- ], $this->response->getHeaders());
-
- $strings = [
- 'mailto:user2.sabredav@sabredav.org ',
- '3.7;No schedule-inbox-URL property found ',
- ];
-
- foreach ($strings as $string) {
- $this->assertTrue(
- strpos($this->response->body, $string) !== false,
- 'The response body did not contain: ' . $string . 'Full response: ' . $this->response->body
- );
- }
-
- }
-
- function testSucceedUseVAVAILABILITY() {
-
- $this->server->httpRequest = new HTTP\Request(
- 'POST',
- '/calendars/user1/outbox',
- ['Content-Type' => 'text/calendar']
- );
-
- $body = <<server->httpRequest->setBody($body);
-
- // Lazily making the current principal an admin.
- $this->aclPlugin->adminPrincipals[] = 'principals/user1';
-
- // Adding VAVAILABILITY manually
- $this->server->on('propFind', function(DAV\PropFind $propFind) {
-
- $propFind->handle('{' . Plugin::NS_CALDAV . '}calendar-availability', function() {
-
- $avail = <<assertFalse(
- $this->plugin->httpPost($this->server->httpRequest, $this->response)
- );
-
- $this->assertEquals(200, $this->response->status);
- $this->assertEquals([
- 'Content-Type' => ['application/xml'],
- ], $this->response->getHeaders());
-
- $strings = [
- 'mailto:user2.sabredav@sabredav.org ',
- '2.0;Success ',
- 'FREEBUSY;FBTYPE=BUSY-UNAVAILABLE:20110101T080000Z/20110101T090000Z',
- 'FREEBUSY:20110101T120000Z/20110101T130000Z',
- 'FREEBUSY;FBTYPE=BUSY-UNAVAILABLE:20110101T170000Z/20110101T180000Z',
- ];
-
- foreach ($strings as $string) {
- $this->assertTrue(
- strpos($this->response->body, $string) !== false,
- 'The response body did not contain: ' . $string . 'Full response: ' . $this->response->body
- );
- }
-
- }
-
- /*
- function testNoPrivilege() {
-
- $this->markTestIncomplete('Currently there\'s no "no privilege" situation');
-
- $this->server->httpRequest = HTTP\Sapi::createFromServerArray(array(
- 'CONTENT_TYPE' => 'text/calendar',
- 'REQUEST_METHOD' => 'POST',
- 'REQUEST_URI' => '/calendars/user1/outbox',
- ));
-
- $body = <<server->httpRequest->setBody($body);
-
- $this->assertFalse(
- $this->plugin->httpPost($this->server->httpRequest, $this->response)
- );
-
- $this->assertEquals(200, $this->response->status);
- $this->assertEquals([
- 'Content-Type' => 'application/xml',
- ], $this->response->getHeaders());
-
- $strings = [
- 'mailto:user2.sabredav@sabredav.org ',
- '3.7;No calendar-home-set property found ',
- ];
-
- foreach($strings as $string) {
- $this->assertTrue(
- strpos($this->response->body, $string)!==false,
- 'The response body did not contain: ' . $string .'Full response: ' . $this->response->body
- );
- }
-
-
- }*/
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/IMip/MockPlugin.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/IMip/MockPlugin.php
deleted file mode 100644
index 02846609354..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/IMip/MockPlugin.php
+++ /dev/null
@@ -1,50 +0,0 @@
-emails[] = [
- 'to' => $to,
- 'subject' => $subject,
- 'body' => $body,
- 'headers' => $headers,
- ];
-
- }
-
- function getSentEmails() {
-
- return $this->emails;
-
- }
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/IMipPluginTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/IMipPluginTest.php
deleted file mode 100644
index 7311999f5b4..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/IMipPluginTest.php
+++ /dev/null
@@ -1,221 +0,0 @@
-assertEquals(
- 'imip',
- $plugin->getPluginInfo()['name']
- );
-
- }
-
- function testDeliverReply() {
-
- $message = new Message();
- $message->sender = 'mailto:sender@example.org';
- $message->senderName = 'Sender';
- $message->recipient = 'mailto:recipient@example.org';
- $message->recipientName = 'Recipient';
- $message->method = 'REPLY';
-
- $ics = <<message = Reader::read($ics);
-
- $result = $this->schedule($message);
-
- $expected = [
- [
- 'to' => 'Recipient ',
- 'subject' => 'Re: Birthday party',
- 'body' => $ics,
- 'headers' => [
- 'Reply-To: Sender ',
- 'From: system@example.org',
- 'Content-Type: text/calendar; charset=UTF-8; method=REPLY',
- 'X-Sabre-Version: ' . \Sabre\DAV\Version::VERSION,
- ],
- ]
- ];
-
- $this->assertEquals($expected, $result);
-
- }
-
- function testDeliverReplyNoMailto() {
-
- $message = new Message();
- $message->sender = 'mailto:sender@example.org';
- $message->senderName = 'Sender';
- $message->recipient = 'http://example.org/recipient';
- $message->recipientName = 'Recipient';
- $message->method = 'REPLY';
-
- $ics = <<message = Reader::read($ics);
-
- $result = $this->schedule($message);
-
- $expected = [];
-
- $this->assertEquals($expected, $result);
-
- }
-
- function testDeliverRequest() {
-
- $message = new Message();
- $message->sender = 'mailto:sender@example.org';
- $message->senderName = 'Sender';
- $message->recipient = 'mailto:recipient@example.org';
- $message->recipientName = 'Recipient';
- $message->method = 'REQUEST';
-
- $ics = <<message = Reader::read($ics);
-
- $result = $this->schedule($message);
-
- $expected = [
- [
- 'to' => 'Recipient ',
- 'subject' => 'Birthday party',
- 'body' => $ics,
- 'headers' => [
- 'Reply-To: Sender ',
- 'From: system@example.org',
- 'Content-Type: text/calendar; charset=UTF-8; method=REQUEST',
- 'X-Sabre-Version: ' . \Sabre\DAV\Version::VERSION,
- ],
- ]
- ];
-
- $this->assertEquals($expected, $result);
-
- }
-
- function testDeliverCancel() {
-
- $message = new Message();
- $message->sender = 'mailto:sender@example.org';
- $message->senderName = 'Sender';
- $message->recipient = 'mailto:recipient@example.org';
- $message->recipientName = 'Recipient';
- $message->method = 'CANCEL';
-
- $ics = <<message = Reader::read($ics);
-
- $result = $this->schedule($message);
-
- $expected = [
- [
- 'to' => 'Recipient ',
- 'subject' => 'Cancelled: Birthday party',
- 'body' => $ics,
- 'headers' => [
- 'Reply-To: Sender ',
- 'From: system@example.org',
- 'Content-Type: text/calendar; charset=UTF-8; method=CANCEL',
- 'X-Sabre-Version: ' . \Sabre\DAV\Version::VERSION,
- ],
- ]
- ];
-
- $this->assertEquals($expected, $result);
- $this->assertEquals('1.1', substr($message->scheduleStatus, 0, 3));
-
- }
-
- function schedule(Message $message) {
-
- $plugin = new IMip\MockPlugin('system@example.org');
-
- $server = new Server();
- $server->addPlugin($plugin);
- $server->emit('schedule', [$message]);
-
- return $plugin->getSentEmails();
-
- }
-
- function testDeliverInsignificantRequest() {
-
- $message = new Message();
- $message->sender = 'mailto:sender@example.org';
- $message->senderName = 'Sender';
- $message->recipient = 'mailto:recipient@example.org';
- $message->recipientName = 'Recipient';
- $message->method = 'REQUEST';
- $message->significantChange = false;
-
- $ics = <<message = Reader::read($ics);
-
- $result = $this->schedule($message);
-
- $expected = [];
- $this->assertEquals($expected, $result);
- $this->assertEquals('1.0', $message->getScheduleStatus()[0]);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/InboxTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/InboxTest.php
deleted file mode 100644
index 01c3488afd6..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/InboxTest.php
+++ /dev/null
@@ -1,136 +0,0 @@
-assertEquals('inbox', $inbox->getName());
- $this->assertEquals([], $inbox->getChildren());
- $this->assertEquals('principals/user1', $inbox->getOwner());
- $this->assertEquals(null, $inbox->getGroup());
-
- $this->assertEquals([
- [
- 'privilege' => '{DAV:}read',
- 'principal' => '{DAV:}authenticated',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}write-properties',
- 'principal' => 'principals/user1',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}unbind',
- 'principal' => 'principals/user1',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}unbind',
- 'principal' => 'principals/user1/calendar-proxy-write',
- 'protected' => true,
- ],
- [
- 'privilege' => '{urn:ietf:params:xml:ns:caldav}schedule-deliver',
- 'principal' => '{DAV:}authenticated',
- 'protected' => true,
- ],
- ], $inbox->getACL());
-
- $ok = false;
-
- }
-
- /**
- * @depends testSetup
- */
- function testGetChildren() {
-
- $backend = new CalDAV\Backend\MockScheduling();
- $inbox = new Inbox(
- $backend,
- 'principals/user1'
- );
-
- $this->assertEquals(
- 0,
- count($inbox->getChildren())
- );
- $backend->createSchedulingObject('principals/user1', 'schedule1.ics', "BEGIN:VCALENDAR\r\nEND:VCALENDAR");
- $this->assertEquals(
- 1,
- count($inbox->getChildren())
- );
- $this->assertInstanceOf('Sabre\CalDAV\Schedule\SchedulingObject', $inbox->getChildren()[0]);
- $this->assertEquals(
- 'schedule1.ics',
- $inbox->getChildren()[0]->getName()
- );
-
- }
-
- /**
- * @depends testGetChildren
- */
- function testCreateFile() {
-
- $backend = new CalDAV\Backend\MockScheduling();
- $inbox = new Inbox(
- $backend,
- 'principals/user1'
- );
-
- $this->assertEquals(
- 0,
- count($inbox->getChildren())
- );
- $inbox->createFile('schedule1.ics', "BEGIN:VCALENDAR\r\nEND:VCALENDAR");
- $this->assertEquals(
- 1,
- count($inbox->getChildren())
- );
- $this->assertInstanceOf('Sabre\CalDAV\Schedule\SchedulingObject', $inbox->getChildren()[0]);
- $this->assertEquals(
- 'schedule1.ics',
- $inbox->getChildren()[0]->getName()
- );
-
- }
-
- /**
- * @depends testSetup
- */
- function testCalendarQuery() {
-
- $backend = new CalDAV\Backend\MockScheduling();
- $inbox = new Inbox(
- $backend,
- 'principals/user1'
- );
-
- $this->assertEquals(
- 0,
- count($inbox->getChildren())
- );
- $backend->createSchedulingObject('principals/user1', 'schedule1.ics', "BEGIN:VCALENDAR\r\nEND:VCALENDAR");
- $this->assertEquals(
- ['schedule1.ics'],
- $inbox->calendarQuery([
- 'name' => 'VCALENDAR',
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'is-not-defined' => false
- ])
- );
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/OutboxPostTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/OutboxPostTest.php
deleted file mode 100644
index 3ab2c2288cf..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/OutboxPostTest.php
+++ /dev/null
@@ -1,134 +0,0 @@
- 'POST',
- 'REQUEST_URI' => '/notfound',
- 'HTTP_CONTENT_TYPE' => 'text/calendar',
- ]);
-
- $this->assertHTTPStatus(501, $req);
-
- }
-
- function testPostPassThruNotTextCalendar() {
-
- $req = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'POST',
- 'REQUEST_URI' => '/calendars/user1/outbox',
- ]);
-
- $this->assertHTTPStatus(501, $req);
-
- }
-
- function testPostPassThruNoOutBox() {
-
- $req = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'POST',
- 'REQUEST_URI' => '/calendars',
- 'HTTP_CONTENT_TYPE' => 'text/calendar',
- ]);
-
- $this->assertHTTPStatus(501, $req);
-
- }
-
- function testInvalidIcalBody() {
-
- $req = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'POST',
- 'REQUEST_URI' => '/calendars/user1/outbox',
- 'HTTP_ORIGINATOR' => 'mailto:user1.sabredav@sabredav.org',
- 'HTTP_RECIPIENT' => 'mailto:user2@example.org',
- 'HTTP_CONTENT_TYPE' => 'text/calendar',
- ]);
- $req->setBody('foo');
-
- $this->assertHTTPStatus(400, $req);
-
- }
-
- function testNoVEVENT() {
-
- $req = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'POST',
- 'REQUEST_URI' => '/calendars/user1/outbox',
- 'HTTP_ORIGINATOR' => 'mailto:user1.sabredav@sabredav.org',
- 'HTTP_RECIPIENT' => 'mailto:user2@example.org',
- 'HTTP_CONTENT_TYPE' => 'text/calendar',
- ]);
-
- $body = [
- 'BEGIN:VCALENDAR',
- 'BEGIN:VTIMEZONE',
- 'END:VTIMEZONE',
- 'END:VCALENDAR',
- ];
-
- $req->setBody(implode("\r\n", $body));
-
- $this->assertHTTPStatus(400, $req);
-
- }
-
- function testNoMETHOD() {
-
- $req = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'POST',
- 'REQUEST_URI' => '/calendars/user1/outbox',
- 'HTTP_ORIGINATOR' => 'mailto:user1.sabredav@sabredav.org',
- 'HTTP_RECIPIENT' => 'mailto:user2@example.org',
- 'HTTP_CONTENT_TYPE' => 'text/calendar',
- ]);
-
- $body = [
- 'BEGIN:VCALENDAR',
- 'BEGIN:VEVENT',
- 'END:VEVENT',
- 'END:VCALENDAR',
- ];
-
- $req->setBody(implode("\r\n", $body));
-
- $this->assertHTTPStatus(400, $req);
-
- }
-
- function testUnsupportedMethod() {
-
- $req = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'POST',
- 'REQUEST_URI' => '/calendars/user1/outbox',
- 'HTTP_ORIGINATOR' => 'mailto:user1.sabredav@sabredav.org',
- 'HTTP_RECIPIENT' => 'mailto:user2@example.org',
- 'HTTP_CONTENT_TYPE' => 'text/calendar',
- ]);
-
- $body = [
- 'BEGIN:VCALENDAR',
- 'METHOD:PUBLISH',
- 'BEGIN:VEVENT',
- 'END:VEVENT',
- 'END:VCALENDAR',
- ];
-
- $req->setBody(implode("\r\n", $body));
-
- $this->assertHTTPStatus(501, $req);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/OutboxTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/OutboxTest.php
deleted file mode 100644
index 04d4b12379e..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/OutboxTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-assertEquals('outbox', $outbox->getName());
- $this->assertEquals([], $outbox->getChildren());
- $this->assertEquals('principals/user1', $outbox->getOwner());
- $this->assertEquals(null, $outbox->getGroup());
-
- $this->assertEquals([
- [
- 'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-send',
- 'principal' => 'principals/user1',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user1',
- 'protected' => true,
- ],
- [
- 'privilege' => '{' . CalDAV\Plugin::NS_CALDAV . '}schedule-send',
- 'principal' => 'principals/user1/calendar-proxy-write',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user1/calendar-proxy-read',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user1/calendar-proxy-write',
- 'protected' => true,
- ],
- ], $outbox->getACL());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/PluginBasicTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/PluginBasicTest.php
deleted file mode 100644
index cee911b6e0b..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/PluginBasicTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-assertEquals(
- 'caldav-schedule',
- $plugin->getPluginInfo()['name']
- );
-
- }
-
- function testOptions() {
-
- $plugin = new Plugin();
- $expected = [
- 'calendar-auto-schedule',
- 'calendar-availability',
- ];
- $this->assertEquals($expected, $plugin->getFeatures());
-
- }
-
- function testGetHTTPMethods() {
-
- $this->assertEquals([], $this->caldavSchedulePlugin->getHTTPMethods('notfound'));
- $this->assertEquals([], $this->caldavSchedulePlugin->getHTTPMethods('calendars/user1'));
- $this->assertEquals(['POST'], $this->caldavSchedulePlugin->getHTTPMethods('calendars/user1/outbox'));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/PluginPropertiesTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/PluginPropertiesTest.php
deleted file mode 100644
index 2d0391893ef..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/PluginPropertiesTest.php
+++ /dev/null
@@ -1,146 +0,0 @@
-caldavBackend->createCalendar(
- 'principals/user1',
- 'default',
- [
-
- ]
- );
- $this->principalBackend->addPrincipal([
- 'uri' => 'principals/user1/calendar-proxy-read'
- ]);
-
- }
-
- function testPrincipalProperties() {
-
- $props = $this->server->getPropertiesForPath('/principals/user1', [
- '{urn:ietf:params:xml:ns:caldav}schedule-inbox-URL',
- '{urn:ietf:params:xml:ns:caldav}schedule-outbox-URL',
- '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set',
- '{urn:ietf:params:xml:ns:caldav}calendar-user-type',
- '{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL',
- ]);
-
- $this->assertArrayHasKey(0, $props);
- $this->assertArrayHasKey(200, $props[0]);
-
- $this->assertArrayHasKey('{urn:ietf:params:xml:ns:caldav}schedule-outbox-URL', $props[0][200]);
- $prop = $props[0][200]['{urn:ietf:params:xml:ns:caldav}schedule-outbox-URL'];
- $this->assertTrue($prop instanceof DAV\Xml\Property\Href);
- $this->assertEquals('calendars/user1/outbox/', $prop->getHref());
-
- $this->assertArrayHasKey('{urn:ietf:params:xml:ns:caldav}schedule-inbox-URL', $props[0][200]);
- $prop = $props[0][200]['{urn:ietf:params:xml:ns:caldav}schedule-inbox-URL'];
- $this->assertTrue($prop instanceof DAV\Xml\Property\Href);
- $this->assertEquals('calendars/user1/inbox/', $prop->getHref());
-
- $this->assertArrayHasKey('{urn:ietf:params:xml:ns:caldav}calendar-user-address-set', $props[0][200]);
- $prop = $props[0][200]['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'];
- $this->assertTrue($prop instanceof DAV\Xml\Property\Href);
- $this->assertEquals(['mailto:user1.sabredav@sabredav.org', '/principals/user1/'], $prop->getHrefs());
-
- $this->assertArrayHasKey('{urn:ietf:params:xml:ns:caldav}calendar-user-type', $props[0][200]);
- $prop = $props[0][200]['{urn:ietf:params:xml:ns:caldav}calendar-user-type'];
- $this->assertEquals('INDIVIDUAL', $prop);
-
- $this->assertArrayHasKey('{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL', $props[0][200]);
- $prop = $props[0][200]['{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL'];
- $this->assertEquals('calendars/user1/default/', $prop->getHref());
-
- }
- function testPrincipalPropertiesBadPrincipal() {
-
- $props = $this->server->getPropertiesForPath('principals/user1/calendar-proxy-read', [
- '{urn:ietf:params:xml:ns:caldav}schedule-inbox-URL',
- '{urn:ietf:params:xml:ns:caldav}schedule-outbox-URL',
- '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set',
- '{urn:ietf:params:xml:ns:caldav}calendar-user-type',
- '{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL',
- ]);
-
- $this->assertArrayHasKey(0, $props);
- $this->assertArrayHasKey(200, $props[0]);
- $this->assertArrayHasKey(404, $props[0]);
-
- $this->assertArrayHasKey('{urn:ietf:params:xml:ns:caldav}schedule-outbox-URL', $props[0][404]);
- $this->assertArrayHasKey('{urn:ietf:params:xml:ns:caldav}schedule-inbox-URL', $props[0][404]);
-
- $prop = $props[0][200]['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'];
- $this->assertTrue($prop instanceof DAV\Xml\Property\Href);
- $this->assertEquals(['/principals/user1/calendar-proxy-read/'], $prop->getHrefs());
-
- $this->assertArrayHasKey('{urn:ietf:params:xml:ns:caldav}calendar-user-type', $props[0][200]);
- $prop = $props[0][200]['{urn:ietf:params:xml:ns:caldav}calendar-user-type'];
- $this->assertEquals('INDIVIDUAL', $prop);
-
- $this->assertArrayHasKey('{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL', $props[0][404]);
-
- }
- function testNoDefaultCalendar() {
-
- foreach ($this->caldavBackend->getCalendarsForUser('principals/user1') as $calendar) {
- $this->caldavBackend->deleteCalendar($calendar['id']);
- }
- $props = $this->server->getPropertiesForPath('/principals/user1', [
- '{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL',
- ]);
-
- $this->assertArrayHasKey(0, $props);
- $this->assertArrayHasKey(404, $props[0]);
-
- $this->assertArrayHasKey('{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL', $props[0][404]);
-
- }
-
- /**
- * There are two properties for availability. The server should
- * automatically map the old property to the standard property.
- */
- function testAvailabilityMapping() {
-
- $path = 'calendars/user1/inbox';
- $oldProp = '{http://calendarserver.org/ns/}calendar-availability';
- $newProp = '{urn:ietf:params:xml:ns:caldav}calendar-availability';
- $value1 = 'first value';
- $value2 = 'second value';
-
- // Storing with the old name
- $this->server->updateProperties($path, [
- $oldProp => $value1
- ]);
-
- // Retrieving with the new name
- $this->assertEquals(
- [$newProp => $value1],
- $this->server->getProperties($path, [$newProp])
- );
-
- // Storing with the new name
- $this->server->updateProperties($path, [
- $newProp => $value2
- ]);
-
- // Retrieving with the old name
- $this->assertEquals(
- [$oldProp => $value2],
- $this->server->getProperties($path, [$oldProp])
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/PluginPropertiesWithSharedCalendarTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/PluginPropertiesWithSharedCalendarTest.php
deleted file mode 100644
index 870f14c1447..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/PluginPropertiesWithSharedCalendarTest.php
+++ /dev/null
@@ -1,71 +0,0 @@
-caldavBackend->createCalendar(
- 'principals/user1',
- 'shared',
- [
- 'share-access' => DAV\Sharing\Plugin::ACCESS_READWRITE
- ]
- );
- $this->caldavBackend->createCalendar(
- 'principals/user1',
- 'default',
- [
-
- ]
- );
-
- }
-
- function testPrincipalProperties() {
-
- $props = $this->server->getPropertiesForPath('/principals/user1', [
- '{urn:ietf:params:xml:ns:caldav}schedule-inbox-URL',
- '{urn:ietf:params:xml:ns:caldav}schedule-outbox-URL',
- '{urn:ietf:params:xml:ns:caldav}calendar-user-address-set',
- '{urn:ietf:params:xml:ns:caldav}calendar-user-type',
- '{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL',
- ]);
-
- $this->assertArrayHasKey(0, $props);
- $this->assertArrayHasKey(200, $props[0]);
-
- $this->assertArrayHasKey('{urn:ietf:params:xml:ns:caldav}schedule-outbox-URL', $props[0][200]);
- $prop = $props[0][200]['{urn:ietf:params:xml:ns:caldav}schedule-outbox-URL'];
- $this->assertTrue($prop instanceof DAV\Xml\Property\Href);
- $this->assertEquals('calendars/user1/outbox/', $prop->getHref());
-
- $this->assertArrayHasKey('{urn:ietf:params:xml:ns:caldav}schedule-inbox-URL', $props[0][200]);
- $prop = $props[0][200]['{urn:ietf:params:xml:ns:caldav}schedule-inbox-URL'];
- $this->assertTrue($prop instanceof DAV\Xml\Property\Href);
- $this->assertEquals('calendars/user1/inbox/', $prop->getHref());
-
- $this->assertArrayHasKey('{urn:ietf:params:xml:ns:caldav}calendar-user-address-set', $props[0][200]);
- $prop = $props[0][200]['{urn:ietf:params:xml:ns:caldav}calendar-user-address-set'];
- $this->assertTrue($prop instanceof DAV\Xml\Property\Href);
- $this->assertEquals(['mailto:user1.sabredav@sabredav.org', '/principals/user1/'], $prop->getHrefs());
-
- $this->assertArrayHasKey('{urn:ietf:params:xml:ns:caldav}calendar-user-type', $props[0][200]);
- $prop = $props[0][200]['{urn:ietf:params:xml:ns:caldav}calendar-user-type'];
- $this->assertEquals('INDIVIDUAL', $prop);
-
- $this->assertArrayHasKey('{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL', $props[0][200]);
- $prop = $props[0][200]['{urn:ietf:params:xml:ns:caldav}schedule-default-calendar-URL'];
- $this->assertEquals('calendars/user1/default/', $prop->getHref());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/ScheduleDeliverTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/ScheduleDeliverTest.php
deleted file mode 100644
index 8123c685c76..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/ScheduleDeliverTest.php
+++ /dev/null
@@ -1,666 +0,0 @@
- 'principals/user1',
- 'uri' => 'cal',
- ],
- [
- 'principaluri' => 'principals/user2',
- 'uri' => 'cal',
- ],
- ];
-
- function setUp() {
-
- $this->calendarObjectUri = '/calendars/user1/cal/object.ics';
-
- parent::setUp();
-
- }
-
- function testNewInvite() {
-
- $newObject = <<deliver(null, $newObject);
- $this->assertItemsInInbox('user2', 1);
-
- $expected = <<assertVObjectEqualsVObject(
- $expected,
- $newObject
- );
-
- }
-
- function testNewOnWrongCollection() {
-
- $newObject = <<calendarObjectUri = '/calendars/user1/object.ics';
- $this->deliver(null, $newObject);
- $this->assertItemsInInbox('user2', 0);
-
-
- }
- function testNewInviteSchedulingDisabled() {
-
- $newObject = <<deliver(null, $newObject, true);
- $this->assertItemsInInbox('user2', 0);
-
- }
- function testUpdatedInvite() {
-
- $newObject = <<deliver($oldObject, $newObject);
- $this->assertItemsInInbox('user2', 1);
-
- $expected = <<assertVObjectEqualsVObject(
- $expected,
- $newObject
- );
-
-
- }
- function testUpdatedInviteSchedulingDisabled() {
-
- $newObject = <<deliver($oldObject, $newObject, true);
- $this->assertItemsInInbox('user2', 0);
-
- }
-
- function testUpdatedInviteWrongPath() {
-
- $newObject = <<calendarObjectUri = '/calendars/user1/inbox/foo.ics';
- $this->deliver($oldObject, $newObject);
- $this->assertItemsInInbox('user2', 0);
-
- }
-
- function testDeletedInvite() {
-
- $newObject = null;
-
- $oldObject = <<deliver($oldObject, $newObject);
- $this->assertItemsInInbox('user2', 1);
-
- }
-
- function testDeletedInviteSchedulingDisabled() {
-
- $newObject = null;
-
- $oldObject = <<deliver($oldObject, $newObject, true);
- $this->assertItemsInInbox('user2', 0);
-
- }
-
- /**
- * A MOVE request will trigger an unbind on a scheduling resource.
- *
- * However, we must not treat it as a cancellation, it just got moved to a
- * different calendar.
- */
- function testUnbindIgnoredOnMove() {
-
- $newObject = null;
-
- $oldObject = <<server->httpRequest->setMethod('MOVE');
- $this->deliver($oldObject, $newObject);
- $this->assertItemsInInbox('user2', 0);
-
- }
-
- function testDeletedInviteWrongUrl() {
-
- $newObject = null;
-
- $oldObject = <<calendarObjectUri = '/calendars/user1/inbox/foo.ics';
- $this->deliver($oldObject, $newObject);
- $this->assertItemsInInbox('user2', 0);
-
- }
-
- function testReply() {
-
- $oldObject = <<putPath('calendars/user2/cal/foo.ics', $oldObject);
-
- $this->deliver($oldObject, $newObject);
- $this->assertItemsInInbox('user2', 1);
- $this->assertItemsInInbox('user1', 0);
-
- $expected = <<assertVObjectEqualsVObject(
- $expected,
- $newObject
- );
-
- }
-
-
-
- function testInviteUnknownUser() {
-
- $newObject = <<deliver(null, $newObject);
-
- $expected = <<assertVObjectEqualsVObject(
- $expected,
- $newObject
- );
-
- }
-
- function testInviteNoInboxUrl() {
-
- $newObject = <<server->on('propFind', function($propFind) {
- $propFind->set('{' . Plugin::NS_CALDAV . '}schedule-inbox-URL', null, 403);
- });
- $this->deliver(null, $newObject);
-
- $expected = <<assertVObjectEqualsVObject(
- $expected,
- $newObject
- );
-
- }
-
- function testInviteNoCalendarHomeSet() {
-
- $newObject = <<server->on('propFind', function($propFind) {
- $propFind->set('{' . Plugin::NS_CALDAV . '}calendar-home-set', null, 403);
- });
- $this->deliver(null, $newObject);
-
- $expected = <<assertVObjectEqualsVObject(
- $expected,
- $newObject
- );
-
- }
- function testInviteNoDefaultCalendar() {
-
- $newObject = <<server->on('propFind', function($propFind) {
- $propFind->set('{' . Plugin::NS_CALDAV . '}schedule-default-calendar-URL', null, 403);
- });
- $this->deliver(null, $newObject);
-
- $expected = <<assertVObjectEqualsVObject(
- $expected,
- $newObject
- );
-
- }
- function testInviteNoScheduler() {
-
- $newObject = <<server->removeAllListeners('schedule');
- $this->deliver(null, $newObject);
-
- $expected = <<assertVObjectEqualsVObject(
- $expected,
- $newObject
- );
-
- }
- function testInviteNoACLPlugin() {
-
- $this->setupACL = false;
- parent::setUp();
-
- $newObject = <<deliver(null, $newObject);
-
- $expected = <<assertVObjectEqualsVObject(
- $expected,
- $newObject
- );
-
- }
-
- protected $calendarObjectUri;
-
- function deliver($oldObject, &$newObject, $disableScheduling = false) {
-
- $this->server->httpRequest->setUrl($this->calendarObjectUri);
- if ($disableScheduling) {
- $this->server->httpRequest->setHeader('Schedule-Reply', 'F');
- }
-
- if ($oldObject && $newObject) {
- // update
- $this->putPath($this->calendarObjectUri, $oldObject);
-
- $stream = fopen('php://memory', 'r+');
- fwrite($stream, $newObject);
- rewind($stream);
- $modified = false;
-
- $this->server->emit('beforeWriteContent', [
- $this->calendarObjectUri,
- $this->server->tree->getNodeForPath($this->calendarObjectUri),
- &$stream,
- &$modified
- ]);
- if ($modified) {
- $newObject = $stream;
- }
-
- } elseif ($oldObject && !$newObject) {
- // delete
- $this->putPath($this->calendarObjectUri, $oldObject);
-
- $this->caldavSchedulePlugin->beforeUnbind(
- $this->calendarObjectUri
- );
- } else {
-
- // create
- $stream = fopen('php://memory', 'r+');
- fwrite($stream, $newObject);
- rewind($stream);
- $modified = false;
- $this->server->emit('beforeCreateFile', [
- $this->calendarObjectUri,
- &$stream,
- $this->server->tree->getNodeForPath(dirname($this->calendarObjectUri)),
- &$modified
- ]);
-
- if ($modified) {
- $newObject = $stream;
- }
- }
-
- }
-
-
- /**
- * Creates or updates a node at the specified path.
- *
- * This circumvents sabredav's internal server apis, so all events and
- * access control is skipped.
- *
- * @param string $path
- * @param string $data
- * @return void
- */
- function putPath($path, $data) {
-
- list($parent, $base) = \Sabre\HTTP\UrlUtil::splitPath($path);
- $parentNode = $this->server->tree->getNodeForPath($parent);
-
- /*
- if ($parentNode->childExists($base)) {
- $childNode = $parentNode->getChild($base);
- $childNode->put($data);
- } else {*/
- $parentNode->createFile($base, $data);
- //}
-
- }
-
- function assertItemsInInbox($user, $count) {
-
- $inboxNode = $this->server->tree->getNodeForPath('calendars/' . $user . '/inbox');
- $this->assertEquals($count, count($inboxNode->getChildren()));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/SchedulingObjectTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/SchedulingObjectTest.php
deleted file mode 100644
index be83cd08110..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Schedule/SchedulingObjectTest.php
+++ /dev/null
@@ -1,378 +0,0 @@
-markTestSkipped('SQLite driver is not available');
- $this->backend = new Backend\MockScheduling();
-
- $this->data = <<data = <<inbox = new Inbox($this->backend, 'principals/user1');
- $this->inbox->createFile('item1.ics', $this->data);
-
- }
-
- function teardown() {
-
- unset($this->inbox);
- unset($this->backend);
-
- }
-
- function testSetup() {
-
- $children = $this->inbox->getChildren();
- $this->assertTrue($children[0] instanceof SchedulingObject);
-
- $this->assertInternalType('string', $children[0]->getName());
- $this->assertInternalType('string', $children[0]->get());
- $this->assertInternalType('string', $children[0]->getETag());
- $this->assertEquals('text/calendar; charset=utf-8', $children[0]->getContentType());
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testInvalidArg1() {
-
- $obj = new SchedulingObject(
- new Backend\MockScheduling([], []),
- [],
- []
- );
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testInvalidArg2() {
-
- $obj = new SchedulingObject(
- new Backend\MockScheduling([], []),
- [],
- ['calendarid' => '1']
- );
-
- }
-
- /**
- * @depends testSetup
- * @expectedException \Sabre\DAV\Exception\MethodNotAllowed
- */
- function testPut() {
-
- $children = $this->inbox->getChildren();
- $this->assertTrue($children[0] instanceof SchedulingObject);
-
- $children[0]->put('');
-
- }
-
- /**
- * @depends testSetup
- */
- function testDelete() {
-
- $children = $this->inbox->getChildren();
- $this->assertTrue($children[0] instanceof SchedulingObject);
-
- $obj = $children[0];
- $obj->delete();
-
- $children2 = $this->inbox->getChildren();
- $this->assertEquals(count($children) - 1, count($children2));
-
- }
-
- /**
- * @depends testSetup
- */
- function testGetLastModified() {
-
- $children = $this->inbox->getChildren();
- $this->assertTrue($children[0] instanceof SchedulingObject);
-
- $obj = $children[0];
-
- $lastMod = $obj->getLastModified();
- $this->assertTrue(is_int($lastMod) || ctype_digit($lastMod) || is_null($lastMod));
-
- }
-
- /**
- * @depends testSetup
- */
- function testGetSize() {
-
- $children = $this->inbox->getChildren();
- $this->assertTrue($children[0] instanceof SchedulingObject);
-
- $obj = $children[0];
-
- $size = $obj->getSize();
- $this->assertInternalType('int', $size);
-
- }
-
- function testGetOwner() {
-
- $children = $this->inbox->getChildren();
- $this->assertTrue($children[0] instanceof SchedulingObject);
-
- $obj = $children[0];
- $this->assertEquals('principals/user1', $obj->getOwner());
-
- }
-
- function testGetGroup() {
-
- $children = $this->inbox->getChildren();
- $this->assertTrue($children[0] instanceof SchedulingObject);
-
- $obj = $children[0];
- $this->assertNull($obj->getGroup());
-
- }
-
- function testGetACL() {
-
- $expected = [
- [
- 'privilege' => '{DAV:}all',
- 'principal' => '{DAV:}owner',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}all',
- 'principal' => 'principals/user1/calendar-proxy-write',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user1/calendar-proxy-read',
- 'protected' => true,
- ],
- ];
-
- $children = $this->inbox->getChildren();
- $this->assertTrue($children[0] instanceof SchedulingObject);
-
- $obj = $children[0];
- $this->assertEquals($expected, $obj->getACL());
-
- }
-
- function testDefaultACL() {
-
- $backend = new Backend\MockScheduling([], []);
- $calendarObject = new SchedulingObject($backend, ['calendarid' => 1, 'uri' => 'foo', 'principaluri' => 'principals/user1']);
- $expected = [
- [
- 'privilege' => '{DAV:}all',
- 'principal' => '{DAV:}owner',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}all',
- 'principal' => 'principals/user1/calendar-proxy-write',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user1/calendar-proxy-read',
- 'protected' => true,
- ],
- ];
- $this->assertEquals($expected, $calendarObject->getACL());
-
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\Forbidden
- */
- function testSetACL() {
-
- $children = $this->inbox->getChildren();
- $this->assertTrue($children[0] instanceof SchedulingObject);
-
- $obj = $children[0];
- $obj->setACL([]);
-
- }
-
- function testGet() {
-
- $children = $this->inbox->getChildren();
- $this->assertTrue($children[0] instanceof SchedulingObject);
-
- $obj = $children[0];
-
- $this->assertEquals($this->data, $obj->get());
-
- }
-
- function testGetRefetch() {
-
- $backend = new Backend\MockScheduling();
- $backend->createSchedulingObject('principals/user1', 'foo', 'foo');
-
- $obj = new SchedulingObject($backend, [
- 'calendarid' => 1,
- 'uri' => 'foo',
- 'principaluri' => 'principals/user1',
- ]);
-
- $this->assertEquals('foo', $obj->get());
-
- }
-
- function testGetEtag1() {
-
- $objectInfo = [
- 'calendardata' => 'foo',
- 'uri' => 'foo',
- 'etag' => 'bar',
- 'calendarid' => 1
- ];
-
- $backend = new Backend\MockScheduling([], []);
- $obj = new SchedulingObject($backend, $objectInfo);
-
- $this->assertEquals('bar', $obj->getETag());
-
- }
-
- function testGetEtag2() {
-
- $objectInfo = [
- 'calendardata' => 'foo',
- 'uri' => 'foo',
- 'calendarid' => 1
- ];
-
- $backend = new Backend\MockScheduling([], []);
- $obj = new SchedulingObject($backend, $objectInfo);
-
- $this->assertEquals('"' . md5('foo') . '"', $obj->getETag());
-
- }
-
- function testGetSupportedPrivilegesSet() {
-
- $objectInfo = [
- 'calendardata' => 'foo',
- 'uri' => 'foo',
- 'calendarid' => 1
- ];
-
- $backend = new Backend\MockScheduling([], []);
- $obj = new SchedulingObject($backend, $objectInfo);
- $this->assertNull($obj->getSupportedPrivilegeSet());
-
- }
-
- function testGetSize1() {
-
- $objectInfo = [
- 'calendardata' => 'foo',
- 'uri' => 'foo',
- 'calendarid' => 1
- ];
-
- $backend = new Backend\MockScheduling([], []);
- $obj = new SchedulingObject($backend, $objectInfo);
- $this->assertEquals(3, $obj->getSize());
-
- }
-
- function testGetSize2() {
-
- $objectInfo = [
- 'uri' => 'foo',
- 'calendarid' => 1,
- 'size' => 4,
- ];
-
- $backend = new Backend\MockScheduling([], []);
- $obj = new SchedulingObject($backend, $objectInfo);
- $this->assertEquals(4, $obj->getSize());
-
- }
-
- function testGetContentType() {
-
- $objectInfo = [
- 'uri' => 'foo',
- 'calendarid' => 1,
- ];
-
- $backend = new Backend\MockScheduling([], []);
- $obj = new SchedulingObject($backend, $objectInfo);
- $this->assertEquals('text/calendar; charset=utf-8', $obj->getContentType());
-
- }
-
- function testGetContentType2() {
-
- $objectInfo = [
- 'uri' => 'foo',
- 'calendarid' => 1,
- 'component' => 'VEVENT',
- ];
-
- $backend = new Backend\MockScheduling([], []);
- $obj = new SchedulingObject($backend, $objectInfo);
- $this->assertEquals('text/calendar; charset=utf-8; component=VEVENT', $obj->getContentType());
-
- }
- function testGetACL2() {
-
- $objectInfo = [
- 'uri' => 'foo',
- 'calendarid' => 1,
- 'acl' => [],
- ];
-
- $backend = new Backend\MockScheduling([], []);
- $obj = new SchedulingObject($backend, $objectInfo);
- $this->assertEquals([], $obj->getACL());
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/SharedCalendarTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/SharedCalendarTest.php
deleted file mode 100644
index f71c195238c..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/SharedCalendarTest.php
+++ /dev/null
@@ -1,176 +0,0 @@
- 1,
- '{http://calendarserver.org/ns/}shared-url' => 'calendars/owner/original',
- '{http://sabredav.org/ns}owner-principal' => 'principals/owner',
- '{http://sabredav.org/ns}read-only' => false,
- 'share-access' => Sharing\Plugin::ACCESS_READWRITE,
- 'principaluri' => 'principals/sharee',
- ];
- }
-
- $this->backend = new Backend\MockSharing(
- [$props],
- [],
- []
- );
-
- $sharee = new Sharee();
- $sharee->href = 'mailto:removeme@example.org';
- $sharee->properties['{DAV:}displayname'] = 'To be removed';
- $sharee->access = Sharing\Plugin::ACCESS_READ;
- $this->backend->updateInvites(1, [$sharee]);
-
- return new SharedCalendar($this->backend, $props);
-
- }
-
- function testGetInvites() {
-
- $sharee = new Sharee();
- $sharee->href = 'mailto:removeme@example.org';
- $sharee->properties['{DAV:}displayname'] = 'To be removed';
- $sharee->access = Sharing\Plugin::ACCESS_READ;
- $sharee->inviteStatus = Sharing\Plugin::INVITE_NORESPONSE;
-
- $this->assertEquals(
- [$sharee],
- $this->getInstance()->getInvites()
- );
-
- }
-
- function testGetOwner() {
- $this->assertEquals('principals/sharee', $this->getInstance()->getOwner());
- }
-
- function testGetACL() {
-
- $expected = [
- [
- 'privilege' => '{DAV:}write',
- 'principal' => 'principals/sharee',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}write',
- 'principal' => 'principals/sharee/calendar-proxy-write',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}write-properties',
- 'principal' => 'principals/sharee',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}write-properties',
- 'principal' => 'principals/sharee/calendar-proxy-write',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/sharee',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/sharee/calendar-proxy-read',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/sharee/calendar-proxy-write',
- 'protected' => true,
- ],
- [
- 'privilege' => '{' . Plugin::NS_CALDAV . '}read-free-busy',
- 'principal' => '{DAV:}authenticated',
- 'protected' => true,
- ],
- ];
-
- $this->assertEquals($expected, $this->getInstance()->getACL());
-
- }
-
- function testGetChildACL() {
-
- $expected = [
- [
- 'privilege' => '{DAV:}write',
- 'principal' => 'principals/sharee',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}write',
- 'principal' => 'principals/sharee/calendar-proxy-write',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/sharee',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/sharee/calendar-proxy-write',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/sharee/calendar-proxy-read',
- 'protected' => true,
- ],
-
- ];
-
- $this->assertEquals($expected, $this->getInstance()->getChildACL());
-
- }
-
- function testUpdateInvites() {
-
- $instance = $this->getInstance();
- $newSharees = [
- new Sharee(),
- new Sharee()
- ];
- $newSharees[0]->href = 'mailto:test@example.org';
- $newSharees[0]->properties['{DAV:}displayname'] = 'Foo Bar';
- $newSharees[0]->comment = 'Booh';
- $newSharees[0]->access = Sharing\Plugin::ACCESS_READWRITE;
-
- $newSharees[1]->href = 'mailto:removeme@example.org';
- $newSharees[1]->access = Sharing\Plugin::ACCESS_NOACCESS;
-
- $instance->updateInvites($newSharees);
-
- $expected = [
- clone $newSharees[0]
- ];
- $expected[0]->inviteStatus = Sharing\Plugin::INVITE_NORESPONSE;
- $this->assertEquals($expected, $instance->getInvites());
-
- }
-
- function testPublish() {
-
- $instance = $this->getInstance();
- $this->assertNull($instance->setPublishStatus(true));
- $this->assertNull($instance->setPublishStatus(false));
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/SharingPluginTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/SharingPluginTest.php
deleted file mode 100644
index 9589176a368..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/SharingPluginTest.php
+++ /dev/null
@@ -1,396 +0,0 @@
-caldavCalendars = [
- [
- 'principaluri' => 'principals/user1',
- 'id' => 1,
- 'uri' => 'cal1',
- ],
- [
- 'principaluri' => 'principals/user1',
- 'id' => 2,
- 'uri' => 'cal2',
- 'share-access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READWRITE,
- ],
- [
- 'principaluri' => 'principals/user1',
- 'id' => 3,
- 'uri' => 'cal3',
- ],
- ];
-
- parent::setUp();
-
- // Making the logged in user an admin, for full access:
- $this->aclPlugin->adminPrincipals[] = 'principals/user2';
-
- }
-
- function testSimple() {
-
- $this->assertInstanceOf('Sabre\\CalDAV\\SharingPlugin', $this->server->getPlugin('caldav-sharing'));
- $this->assertEquals(
- 'caldav-sharing',
- $this->caldavSharingPlugin->getPluginInfo()['name']
- );
-
- }
-
- /**
- * @expectedException \LogicException
- */
- function testSetupWithoutCoreSharingPlugin() {
-
- $server = new DAV\Server();
- $server->addPlugin(
- new SharingPlugin()
- );
-
- }
-
- function testGetFeatures() {
-
- $this->assertEquals(['calendarserver-sharing'], $this->caldavSharingPlugin->getFeatures());
-
- }
-
- function testBeforeGetShareableCalendar() {
-
- // Forcing the server to authenticate:
- $this->authPlugin->beforeMethod(new HTTP\Request(), new HTTP\Response());
- $props = $this->server->getProperties('calendars/user1/cal1', [
- '{' . Plugin::NS_CALENDARSERVER . '}invite',
- '{' . Plugin::NS_CALENDARSERVER . '}allowed-sharing-modes',
- ]);
-
- $this->assertInstanceOf('Sabre\\CalDAV\\Xml\\Property\\Invite', $props['{' . Plugin::NS_CALENDARSERVER . '}invite']);
- $this->assertInstanceOf('Sabre\\CalDAV\\Xml\\Property\\AllowedSharingModes', $props['{' . Plugin::NS_CALENDARSERVER . '}allowed-sharing-modes']);
-
- }
-
- function testBeforeGetSharedCalendar() {
-
- $props = $this->server->getProperties('calendars/user1/cal2', [
- '{' . Plugin::NS_CALENDARSERVER . '}shared-url',
- '{' . Plugin::NS_CALENDARSERVER . '}invite',
- ]);
-
- $this->assertInstanceOf('Sabre\\CalDAV\\Xml\\Property\\Invite', $props['{' . Plugin::NS_CALENDARSERVER . '}invite']);
- //$this->assertInstanceOf('Sabre\\DAV\\Xml\\Property\\Href', $props['{' . Plugin::NS_CALENDARSERVER . '}shared-url']);
-
- }
-
- function testUpdateResourceType() {
-
- $this->caldavBackend->updateInvites(1,
- [
- new Sharee([
- 'href' => 'mailto:joe@example.org',
- ])
- ]
- );
- $result = $this->server->updateProperties('calendars/user1/cal1', [
- '{DAV:}resourcetype' => new DAV\Xml\Property\ResourceType(['{DAV:}collection'])
- ]);
-
- $this->assertEquals([
- '{DAV:}resourcetype' => 200
- ], $result);
-
- $this->assertEquals(0, count($this->caldavBackend->getInvites(1)));
-
- }
-
- function testUpdatePropertiesPassThru() {
-
- $result = $this->server->updateProperties('calendars/user1/cal3', [
- '{DAV:}foo' => 'bar',
- ]);
-
- $this->assertEquals([
- '{DAV:}foo' => 200,
- ], $result);
-
- }
-
- function testUnknownMethodNoPOST() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'PATCH',
- 'REQUEST_URI' => '/',
- ]);
-
- $response = $this->request($request);
-
- $this->assertEquals(501, $response->status, $response->body);
-
- }
-
- function testUnknownMethodNoXML() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'POST',
- 'REQUEST_URI' => '/',
- 'CONTENT_TYPE' => 'text/plain',
- ]);
-
- $response = $this->request($request);
-
- $this->assertEquals(501, $response->status, $response->body);
-
- }
-
- function testUnknownMethodNoNode() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'POST',
- 'REQUEST_URI' => '/foo',
- 'CONTENT_TYPE' => 'text/xml',
- ]);
-
- $response = $this->request($request);
-
- $this->assertEquals(501, $response->status, $response->body);
-
- }
-
- function testShareRequest() {
-
- $request = new HTTP\Request('POST', '/calendars/user1/cal1', ['Content-Type' => 'text/xml']);
-
- $xml = <<
-
-
- mailto:joe@example.org
- Joe Shmoe
-
-
- mailto:nancy@example.org
-
-
-RRR;
-
- $request->setBody($xml);
-
- $response = $this->request($request, 200);
-
- $this->assertEquals(
- [
- new Sharee([
- 'href' => 'mailto:joe@example.org',
- 'properties' => [
- '{DAV:}displayname' => 'Joe Shmoe',
- ],
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READWRITE,
- 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_NORESPONSE,
- 'comment' => '',
- ]),
- ],
- $this->caldavBackend->getInvites(1)
- );
-
- // Wiping out tree cache
- $this->server->tree->markDirty('');
-
- // Verifying that the calendar is now marked shared.
- $props = $this->server->getProperties('calendars/user1/cal1', ['{DAV:}resourcetype']);
- $this->assertTrue(
- $props['{DAV:}resourcetype']->is('{http://calendarserver.org/ns/}shared-owner')
- );
-
- }
-
- function testShareRequestNoShareableCalendar() {
-
- $request = new HTTP\Request(
- 'POST',
- '/calendars/user1/cal2',
- ['Content-Type' => 'text/xml']
- );
-
- $xml = '
-
-
- mailto:joe@example.org
- Joe Shmoe
-
-
- mailto:nancy@example.org
-
-
-';
-
- $request->setBody($xml);
-
- $response = $this->request($request, 403);
-
- }
-
- function testInviteReply() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'POST',
- 'REQUEST_URI' => '/calendars/user1',
- 'CONTENT_TYPE' => 'text/xml',
- ]);
-
- $xml = '
-
- /principals/owner
-';
-
- $request->setBody($xml);
- $response = $this->request($request);
- $this->assertEquals(200, $response->status, $response->body);
-
- }
-
- function testInviteBadXML() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'POST',
- 'REQUEST_URI' => '/calendars/user1',
- 'CONTENT_TYPE' => 'text/xml',
- ]);
-
- $xml = '
-
-
-';
- $request->setBody($xml);
- $response = $this->request($request);
- $this->assertEquals(400, $response->status, $response->body);
-
- }
-
- function testInviteWrongUrl() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'POST',
- 'REQUEST_URI' => '/calendars/user1/cal1',
- 'CONTENT_TYPE' => 'text/xml',
- ]);
-
- $xml = '
-
- /principals/owner
-';
- $request->setBody($xml);
- $response = $this->request($request);
- $this->assertEquals(501, $response->status, $response->body);
-
- // If the plugin did not handle this request, it must ensure that the
- // body is still accessible by other plugins.
- $this->assertEquals($xml, $request->getBody(true));
-
- }
-
- function testPublish() {
-
- $request = new HTTP\Request('POST', '/calendars/user1/cal1', ['Content-Type' => 'text/xml']);
-
- $xml = '
-
-
-
-
- #1C4587FF
- Jewish holidays
- Foo
- 19
-
- webcal://www.example.org/
-
- P1W
-
-
-
-XML;
-
- $headers = [
- 'Content-Type' => 'application/xml',
- ];
- $request = new Request('MKCOL', '/calendars/user1/subscription1', $headers, $body);
-
- $response = $this->request($request);
- $this->assertEquals(201, $response->getStatus());
- $subscriptions = $this->caldavBackend->getSubscriptionsForUser('principals/user1');
- $this->assertSubscription($subscriptions[0]);
-
-
- }
- /**
- * OS X 10.9.2 and up
- */
- function testMKCALENDAR() {
-
- $body = <<
-
-
-
-
-
-
- P1W
-
- webcal://www.example.org/
-
- #1C4587FF
- 19
- Foo
- Jewish holidays
-
-
-
-XML;
-
- $headers = [
- 'Content-Type' => 'application/xml',
- ];
- $request = new Request('MKCALENDAR', '/calendars/user1/subscription1', $headers, $body);
-
- $response = $this->request($request);
- $this->assertEquals(201, $response->getStatus());
- $subscriptions = $this->caldavBackend->getSubscriptionsForUser('principals/user1');
- $this->assertSubscription($subscriptions[0]);
-
- // Also seeing if it works when calling this as a PROPFIND.
- $this->assertEquals([
- '{http://calendarserver.org/ns/}subscribed-strip-alarms' => '',
- ],
- $this->server->getProperties('calendars/user1/subscription1', ['{http://calendarserver.org/ns/}subscribed-strip-alarms'])
- );
-
-
- }
-
- function assertSubscription($subscription) {
-
- $this->assertEquals('', $subscription['{http://calendarserver.org/ns/}subscribed-strip-attachments']);
- $this->assertEquals('', $subscription['{http://calendarserver.org/ns/}subscribed-strip-todos']);
- $this->assertEquals('#1C4587FF', $subscription['{http://apple.com/ns/ical/}calendar-color']);
- $this->assertEquals('Jewish holidays', $subscription['{DAV:}displayname']);
- $this->assertEquals('Foo', $subscription['{urn:ietf:params:xml:ns:caldav}calendar-description']);
- $this->assertEquals('19', $subscription['{http://apple.com/ns/ical/}calendar-order']);
- $this->assertEquals('webcal://www.example.org/', $subscription['{http://calendarserver.org/ns/}source']->getHref());
- $this->assertEquals('P1W', $subscription['{http://apple.com/ns/ical/}refreshrate']);
- $this->assertEquals('subscription1', $subscription['uri']);
- $this->assertEquals('principals/user1', $subscription['principaluri']);
- $this->assertEquals('webcal://www.example.org/', $subscription['source']);
- $this->assertEquals(['principals/user1', 1], $subscription['id']);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Subscriptions/PluginTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Subscriptions/PluginTest.php
deleted file mode 100644
index dc6d2d5f04c..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Subscriptions/PluginTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-addPlugin($plugin);
-
- $this->assertEquals(
- '{http://calendarserver.org/ns/}subscribed',
- $server->resourceTypeMapping['Sabre\\CalDAV\\Subscriptions\\ISubscription']
- );
- $this->assertEquals(
- 'Sabre\\DAV\\Xml\\Property\\Href',
- $server->xml->elementMap['{http://calendarserver.org/ns/}source']
- );
-
- $this->assertEquals(
- ['calendarserver-subscribed'],
- $plugin->getFeatures()
- );
-
- $this->assertEquals(
- 'subscriptions',
- $plugin->getPluginInfo()['name']
- );
-
- }
-
- function testPropFind() {
-
- $propName = '{http://calendarserver.org/ns/}subscribed-strip-alarms';
- $propFind = new PropFind('foo', [$propName]);
- $propFind->set($propName, null, 200);
-
- $plugin = new Plugin();
- $plugin->propFind($propFind, new \Sabre\DAV\SimpleCollection('hi'));
-
- $this->assertFalse(is_null($propFind->get($propName)));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Subscriptions/SubscriptionTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Subscriptions/SubscriptionTest.php
deleted file mode 100644
index 559d526cd1d..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Subscriptions/SubscriptionTest.php
+++ /dev/null
@@ -1,131 +0,0 @@
- new Href('http://example.org/src', false),
- 'lastmodified' => date('2013-04-06 11:40:00'), // tomorrow is my birthday!
- '{DAV:}displayname' => 'displayname',
- ];
-
-
- $id = $caldavBackend->createSubscription('principals/user1', 'uri', array_merge($info, $override));
- $subInfo = $caldavBackend->getSubscriptionsForUser('principals/user1');
-
- $this->assertEquals(1, count($subInfo));
- $subscription = new Subscription($caldavBackend, $subInfo[0]);
-
- $this->backend = $caldavBackend;
- return $subscription;
-
- }
-
- function testValues() {
-
- $sub = $this->getSub();
-
- $this->assertEquals('uri', $sub->getName());
- $this->assertEquals(date('2013-04-06 11:40:00'), $sub->getLastModified());
- $this->assertEquals([], $sub->getChildren());
-
- $this->assertEquals(
- [
- '{DAV:}displayname' => 'displayname',
- '{http://calendarserver.org/ns/}source' => new Href('http://example.org/src', false),
- ],
- $sub->getProperties(['{DAV:}displayname', '{http://calendarserver.org/ns/}source'])
- );
-
- $this->assertEquals('principals/user1', $sub->getOwner());
- $this->assertNull($sub->getGroup());
-
- $acl = [
- [
- 'privilege' => '{DAV:}all',
- 'principal' => 'principals/user1',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}all',
- 'principal' => 'principals/user1/calendar-proxy-write',
- 'protected' => true,
- ],
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user1/calendar-proxy-read',
- 'protected' => true,
- ]
- ];
- $this->assertEquals($acl, $sub->getACL());
-
- $this->assertNull($sub->getSupportedPrivilegeSet());
-
- }
-
- function testValues2() {
-
- $sub = $this->getSub([
- 'lastmodified' => null,
- ]);
-
- $this->assertEquals(null, $sub->getLastModified());
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\Forbidden
- */
- function testSetACL() {
-
- $sub = $this->getSub();
- $sub->setACL([]);
-
- }
-
- function testDelete() {
-
- $sub = $this->getSub();
- $sub->delete();
-
- $this->assertEquals([], $this->backend->getSubscriptionsForUser('principals1/user1'));
-
- }
-
- function testUpdateProperties() {
-
- $sub = $this->getSub();
- $propPatch = new PropPatch([
- '{DAV:}displayname' => 'foo',
- ]);
- $sub->propPatch($propPatch);
- $this->assertTrue($propPatch->commit());
-
- $this->assertEquals(
- 'foo',
- $this->backend->getSubscriptionsForUser('principals/user1')[0]['{DAV:}displayname']
- );
-
- }
-
- /**
- * @expectedException \InvalidArgumentException
- */
- function testBadConstruct() {
-
- $caldavBackend = new \Sabre\CalDAV\Backend\MockSubscriptionSupport([], []);
- new Subscription($caldavBackend, []);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/TestUtil.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/TestUtil.php
deleted file mode 100644
index 673d39c0aa5..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/TestUtil.php
+++ /dev/null
@@ -1,189 +0,0 @@
-createCalendar(
- 'principals/user1',
- 'UUID-123467',
- [
- '{DAV:}displayname' => 'user1 calendar',
- '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'Calendar description',
- '{http://apple.com/ns/ical/}calendar-order' => '1',
- '{http://apple.com/ns/ical/}calendar-color' => '#FF0000',
- ]
- );
- $backend->createCalendar(
- 'principals/user1',
- 'UUID-123468',
- [
- '{DAV:}displayname' => 'user1 calendar2',
- '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'Calendar description',
- '{http://apple.com/ns/ical/}calendar-order' => '1',
- '{http://apple.com/ns/ical/}calendar-color' => '#FF0000',
- ]
- );
- $backend->createCalendarObject($calendarId, 'UUID-2345', self::getTestCalendarData());
- return $backend;
-
- }
-
- static function getTestCalendarData($type = 1) {
-
- $calendarData = 'BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//iCal 4.0.1//EN
-CALSCALE:GREGORIAN
-BEGIN:VTIMEZONE
-TZID:Asia/Seoul
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0900
-RRULE:FREQ=YEARLY;UNTIL=19880507T150000Z;BYMONTH=5;BYDAY=2SU
-DTSTART:19870510T000000
-TZNAME:GMT+09:00
-TZOFFSETTO:+1000
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1000
-DTSTART:19881009T000000
-TZNAME:GMT+09:00
-TZOFFSETTO:+0900
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-CREATED:20100225T154229Z
-UID:39A6B5ED-DD51-4AFE-A683-C35EE3749627
-TRANSP:TRANSPARENT
-SUMMARY:Something here
-DTSTAMP:20100228T130202Z';
-
- switch ($type) {
- case 1 :
- $calendarData .= "\nDTSTART;TZID=Asia/Seoul:20100223T060000\nDTEND;TZID=Asia/Seoul:20100223T070000\n";
- break;
- case 2 :
- $calendarData .= "\nDTSTART:20100223T060000\nDTEND:20100223T070000\n";
- break;
- case 3 :
- $calendarData .= "\nDTSTART;VALUE=DATE:20100223\nDTEND;VALUE=DATE:20100223\n";
- break;
- case 4 :
- $calendarData .= "\nDTSTART;TZID=Asia/Seoul:20100223T060000\nDURATION:PT1H\n";
- break;
- case 5 :
- $calendarData .= "\nDTSTART;TZID=Asia/Seoul:20100223T060000\nDURATION:-P5D\n";
- break;
- case 6 :
- $calendarData .= "\nDTSTART;VALUE=DATE:20100223\n";
- break;
- case 7 :
- $calendarData .= "\nDTSTART;VALUE=DATETIME:20100223T060000\n";
- break;
-
- // No DTSTART, so intentionally broken
- case 'X' :
- $calendarData .= "\n";
- break;
- }
-
-
- $calendarData .= 'ATTENDEE;PARTSTAT=NEEDS-ACTION:mailto:lisa@example.com
-SEQUENCE:2
-END:VEVENT
-END:VCALENDAR';
-
- return $calendarData;
-
- }
-
- static function getTestTODO($type = 'due') {
-
- switch ($type) {
-
- case 'due' :
- $extra = "DUE:20100104T000000Z";
- break;
- case 'due2' :
- $extra = "DUE:20060104T000000Z";
- break;
- case 'due_date' :
- $extra = "DUE;VALUE=DATE:20060104";
- break;
- case 'due_tz' :
- $extra = "DUE;TZID=Asia/Seoul:20060104T000000Z";
- break;
- case 'due_dtstart' :
- $extra = "DTSTART:20050223T060000Z\nDUE:20060104T000000Z";
- break;
- case 'due_dtstart2' :
- $extra = "DTSTART:20090223T060000Z\nDUE:20100104T000000Z";
- break;
- case 'dtstart' :
- $extra = 'DTSTART:20100223T060000Z';
- break;
- case 'dtstart2' :
- $extra = 'DTSTART:20060223T060000Z';
- break;
- case 'dtstart_date' :
- $extra = 'DTSTART;VALUE=DATE:20100223';
- break;
- case 'dtstart_tz' :
- $extra = 'DTSTART;TZID=Asia/Seoul:20100223T060000Z';
- break;
- case 'dtstart_duration' :
- $extra = "DTSTART:20061023T060000Z\nDURATION:PT1H";
- break;
- case 'dtstart_duration2' :
- $extra = "DTSTART:20101023T060000Z\nDURATION:PT1H";
- break;
- case 'completed' :
- $extra = 'COMPLETED:20060601T000000Z';
- break;
- case 'completed2' :
- $extra = 'COMPLETED:20090601T000000Z';
- break;
- case 'created' :
- $extra = 'CREATED:20060601T000000Z';
- break;
- case 'created2' :
- $extra = 'CREATED:20090601T000000Z';
- break;
- case 'completedcreated' :
- $extra = "CREATED:20060601T000000Z\nCOMPLETED:20070101T000000Z";
- break;
- case 'completedcreated2' :
- $extra = "CREATED:20090601T000000Z\nCOMPLETED:20100101T000000Z";
- break;
- case 'notime' :
- $extra = 'X-FILLER:oh hello';
- break;
- default :
- throw new Exception('Unknown type: ' . $type);
-
- }
-
- $todo = 'BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Example Corp.//CalDAV Client//EN
-BEGIN:VTODO
-DTSTAMP:20060205T235335Z
-' . $extra . '
-STATUS:NEEDS-ACTION
-SUMMARY:Task #1
-UID:DDDEEB7915FA61233B861457@example.com
-BEGIN:VALARM
-ACTION:AUDIO
-TRIGGER;RELATED=START:-PT10M
-END:VALARM
-END:VTODO
-END:VCALENDAR';
-
- return $todo;
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/ValidateICalTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/ValidateICalTest.php
deleted file mode 100644
index 629df90c119..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/ValidateICalTest.php
+++ /dev/null
@@ -1,406 +0,0 @@
- 'calendar1',
- 'principaluri' => 'principals/admin',
- 'uri' => 'calendar1',
- '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set' => new Xml\Property\SupportedCalendarComponentSet(['VEVENT', 'VTODO', 'VJOURNAL']),
- ],
- [
- 'id' => 'calendar2',
- 'principaluri' => 'principals/admin',
- 'uri' => 'calendar2',
- '{urn:ietf:params:xml:ns:caldav}supported-calendar-component-set' => new Xml\Property\SupportedCalendarComponentSet(['VTODO', 'VJOURNAL']),
- ]
- ];
-
- $this->calBackend = new Backend\Mock($calendars, []);
- $principalBackend = new DAVACL\PrincipalBackend\Mock();
-
- $tree = [
- new CalendarRoot($principalBackend, $this->calBackend),
- ];
-
- $this->server = new DAV\Server($tree);
- $this->server->sapi = new HTTP\SapiMock();
- $this->server->debugExceptions = true;
-
- $plugin = new Plugin();
- $this->server->addPlugin($plugin);
-
- $response = new HTTP\ResponseMock();
- $this->server->httpResponse = $response;
-
- }
-
- function request(HTTP\Request $request) {
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- return $this->server->httpResponse;
-
- }
-
- function testCreateFile() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'PUT',
- 'REQUEST_URI' => '/calendars/admin/calendar1/blabla.ics',
- ]);
-
- $response = $this->request($request);
-
- $this->assertEquals(415, $response->status);
-
- }
-
- function testCreateFileValid() {
-
- $request = new HTTP\Request(
- 'PUT',
- '/calendars/admin/calendar1/blabla.ics',
- ['Prefer' => 'handling=strict']
- );
-
- $ics = <<setBody($ics);
-
- $response = $this->request($request);
-
- $this->assertEquals(201, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Length' => ['0'],
- 'ETag' => ['"' . md5($ics) . '"'],
- ], $response->getHeaders());
-
- $expected = [
- 'uri' => 'blabla.ics',
- 'calendardata' => $ics,
- 'calendarid' => 'calendar1',
- 'lastmodified' => null,
- ];
-
- $this->assertEquals($expected, $this->calBackend->getCalendarObject('calendar1', 'blabla.ics'));
-
- }
-
- function testCreateFileNoVersion() {
-
- $request = new HTTP\Request(
- 'PUT',
- '/calendars/admin/calendar1/blabla.ics',
- ['Prefer' => 'handling=strict']
- );
-
- $ics = <<setBody($ics);
-
- $response = $this->request($request);
-
- $this->assertEquals(415, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
-
- }
-
- function testCreateFileNoVersionFixed() {
-
- $request = new HTTP\Request(
- 'PUT',
- '/calendars/admin/calendar1/blabla.ics',
- ['Prefer' => 'handling=lenient']
- );
-
- $ics = <<setBody($ics);
-
- $response = $this->request($request);
-
- $this->assertEquals(201, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Length' => ['0'],
- 'X-Sabre-Ew-Gross' => ['iCalendar validation warning: VERSION MUST appear exactly once in a VCALENDAR component'],
- ], $response->getHeaders());
-
- $ics = << 'blabla.ics',
- 'calendardata' => $ics,
- 'calendarid' => 'calendar1',
- 'lastmodified' => null,
- ];
-
- $this->assertEquals($expected, $this->calBackend->getCalendarObject('calendar1', 'blabla.ics'));
-
- }
-
- function testCreateFileNoComponents() {
-
- $request = new HTTP\Request(
- 'PUT',
- '/calendars/admin/calendar1/blabla.ics',
- ['Prefer' => 'handling=strict']
- );
- $ics = <<setBody($ics);
-
- $response = $this->request($request);
- $this->assertEquals(403, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
-
- }
-
- function testCreateFileNoUID() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'PUT',
- 'REQUEST_URI' => '/calendars/admin/calendar1/blabla.ics',
- ]);
- $request->setBody("BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
-
- $response = $this->request($request);
-
- $this->assertEquals(415, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
-
- }
-
- function testCreateFileVCard() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'PUT',
- 'REQUEST_URI' => '/calendars/admin/calendar1/blabla.ics',
- ]);
- $request->setBody("BEGIN:VCARD\r\nEND:VCARD\r\n");
-
- $response = $this->request($request);
-
- $this->assertEquals(415, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
-
- }
-
- function testCreateFile2Components() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'PUT',
- 'REQUEST_URI' => '/calendars/admin/calendar1/blabla.ics',
- ]);
- $request->setBody("BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nUID:foo\r\nEND:VEVENT\r\nBEGIN:VJOURNAL\r\nUID:foo\r\nEND:VJOURNAL\r\nEND:VCALENDAR\r\n");
-
- $response = $this->request($request);
-
- $this->assertEquals(415, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
-
- }
-
- function testCreateFile2UIDS() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'PUT',
- 'REQUEST_URI' => '/calendars/admin/calendar1/blabla.ics',
- ]);
- $request->setBody("BEGIN:VCALENDAR\r\nBEGIN:VTIMEZONE\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nUID:foo\r\nEND:VEVENT\r\nBEGIN:VEVENT\r\nUID:bar\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
-
- $response = $this->request($request);
-
- $this->assertEquals(415, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
-
- }
-
- function testCreateFileWrongComponent() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'PUT',
- 'REQUEST_URI' => '/calendars/admin/calendar1/blabla.ics',
- ]);
- $request->setBody("BEGIN:VCALENDAR\r\nBEGIN:VTIMEZONE\r\nEND:VTIMEZONE\r\nBEGIN:VFREEBUSY\r\nUID:foo\r\nEND:VFREEBUSY\r\nEND:VCALENDAR\r\n");
-
- $response = $this->request($request);
-
- $this->assertEquals(403, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
-
- }
-
- function testUpdateFile() {
-
- $this->calBackend->createCalendarObject('calendar1', 'blabla.ics', 'foo');
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'PUT',
- 'REQUEST_URI' => '/calendars/admin/calendar1/blabla.ics',
- ]);
-
- $response = $this->request($request);
-
- $this->assertEquals(415, $response->status);
-
- }
-
- function testUpdateFileParsableBody() {
-
- $this->calBackend->createCalendarObject('calendar1', 'blabla.ics', 'foo');
- $request = new HTTP\Request(
- 'PUT',
- '/calendars/admin/calendar1/blabla.ics'
- );
- $ics = <<setBody($ics);
- $response = $this->request($request);
-
- $this->assertEquals(204, $response->status);
-
- $expected = [
- 'uri' => 'blabla.ics',
- 'calendardata' => $ics,
- 'calendarid' => 'calendar1',
- 'lastmodified' => null,
- ];
-
- $this->assertEquals($expected, $this->calBackend->getCalendarObject('calendar1', 'blabla.ics'));
-
- }
-
- function testCreateFileInvalidComponent() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'PUT',
- 'REQUEST_URI' => '/calendars/admin/calendar2/blabla.ics',
- ]);
- $request->setBody("BEGIN:VCALENDAR\r\nBEGIN:VTIMEZONE\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nUID:foo\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
-
- $response = $this->request($request);
-
- $this->assertEquals(403, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
-
- }
-
- function testUpdateFileInvalidComponent() {
-
- $this->calBackend->createCalendarObject('calendar2', 'blabla.ics', 'foo');
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'PUT',
- 'REQUEST_URI' => '/calendars/admin/calendar2/blabla.ics',
- ]);
- $request->setBody("BEGIN:VCALENDAR\r\nBEGIN:VTIMEZONE\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nUID:foo\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n");
-
- $response = $this->request($request);
-
- $this->assertEquals(403, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
-
- }
-
- /**
- * What we are testing here, is if we send in a latin1 character, the
- * server should automatically transform this into UTF-8.
- *
- * More importantly. If any transformation happens, the etag must no longer
- * be returned by the server.
- */
- function testCreateFileModified() {
-
- $request = new HTTP\Request(
- 'PUT',
- '/calendars/admin/calendar1/blabla.ics'
- );
- $ics = <<setBody($ics);
-
- $response = $this->request($request);
-
- $this->assertEquals(201, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
- $this->assertNull($response->getHeader('ETag'));
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Notification/InviteReplyTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Notification/InviteReplyTest.php
deleted file mode 100644
index cd700893d67..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Notification/InviteReplyTest.php
+++ /dev/null
@@ -1,146 +0,0 @@
-assertEquals('foo', $notification->getId());
- $this->assertEquals('"1"', $notification->getETag());
-
- $simpleExpected = '' . "\n" . '
-
- 20120101T000000Z
-
- foo
- bar
- mailto:foo@example.org
-
- /calendar
-
-
-
-
-FOO
- ],
- [
- [
- 'id' => 'foo',
- 'dtStamp' => $dtStamp,
- 'etag' => '"1"',
- 'inReplyTo' => 'bar',
- 'href' => 'mailto:foo@example.org',
- 'type' => DAV\Sharing\Plugin::INVITE_DECLINED,
- 'hostUrl' => 'calendar',
- 'summary' => 'Summary!'
- ],
-<<
-
- 20120101T000000Z
-
- foo
- bar
- mailto:foo@example.org
-
- /calendar
-
- Summary!
-
-
-
-FOO
- ],
-
- ];
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testMissingArg() {
-
- new InviteReply([]);
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testUnknownArg() {
-
- new InviteReply([
- 'foo-i-will-break' => true,
-
- 'id' => 1,
- 'etag' => '"bla"',
- 'href' => 'abc',
- 'dtStamp' => 'def',
- 'inReplyTo' => 'qrs',
- 'type' => 'ghi',
- 'hostUrl' => 'jkl',
- ]);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Notification/InviteTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Notification/InviteTest.php
deleted file mode 100644
index f03093916e9..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Notification/InviteTest.php
+++ /dev/null
@@ -1,165 +0,0 @@
-assertEquals('foo', $notification->getId());
- $this->assertEquals('"1"', $notification->getETag());
-
- $simpleExpected = '
-
- 20120101T000000Z
-
- foo
- mailto:foo@example.org
-
- /calendar
-
- Awesome stuff!
-
-
-
- /principal/user1
- John Doe
-
- John Doe
-
-
-
-FOO
- ],
- [
- [
- 'id' => 'foo',
- 'dtStamp' => $dtStamp,
- 'etag' => '"1"',
- 'href' => 'mailto:foo@example.org',
- 'type' => DAV\Sharing\Plugin::INVITE_NORESPONSE,
- 'readOnly' => true,
- 'hostUrl' => 'calendar',
- 'organizer' => 'principal/user1',
- 'firstName' => 'Foo',
- 'lastName' => 'Bar',
- ],
-<<
-
- 20120101T000000Z
-
- foo
- mailto:foo@example.org
-
- /calendar
-
-
-
-
- /principal/user1
- Foo
- Bar
-
- Foo
- Bar
-
-
-
-FOO
- ],
-
- ];
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testMissingArg() {
-
- new Invite([]);
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testUnknownArg() {
-
- new Invite([
- 'foo-i-will-break' => true,
-
- 'id' => 1,
- 'etag' => '"bla"',
- 'href' => 'abc',
- 'dtStamp' => 'def',
- 'type' => 'ghi',
- 'readOnly' => true,
- 'hostUrl' => 'jkl',
- 'organizer' => 'mno',
- ]);
-
- }
-
- function writeFull($input) {
-
- $writer = new Writer();
- $writer->contextUri = '/';
- $writer->namespaceMap = $this->namespaceMap;
- $writer->openMemory();
- $writer->startElement('{http://calendarserver.org/ns/}root');
- $input->xmlSerializeFull($writer);
- $writer->endElement();
- return $writer->outputMemory();
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Notification/SystemStatusTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Notification/SystemStatusTest.php
deleted file mode 100644
index 1f9034340f5..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Notification/SystemStatusTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-assertEquals('foo', $notification->getId());
- $this->assertEquals('"1"', $notification->getETag());
-
- $writer = new Writer();
- $writer->namespaceMap = [
- 'http://calendarserver.org/ns/' => 'cs',
- ];
- $writer->openMemory();
- $writer->startDocument('1.0', 'UTF-8');
- $writer->startElement('{http://calendarserver.org/ns/}root');
- $writer->write($notification);
- $writer->endElement();
- $this->assertXmlStringEqualsXmlString($expected1, $writer->outputMemory());
-
- $writer = new Writer();
- $writer->namespaceMap = [
- 'http://calendarserver.org/ns/' => 'cs',
- 'DAV:' => 'd',
- ];
- $writer->openMemory();
- $writer->startDocument('1.0', 'UTF-8');
- $writer->startElement('{http://calendarserver.org/ns/}root');
- $notification->xmlSerializeFull($writer);
- $writer->endElement();
- $this->assertXmlStringEqualsXmlString($expected2, $writer->outputMemory());
-
- }
-
- function dataProvider() {
-
- return [
-
- [
- new SystemStatus('foo', '"1"'),
- '' . "\n" . 'bar http://example.org/
-
-', $xml);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Property/EmailAddressSetTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Property/EmailAddressSetTest.php
deleted file mode 100644
index 30651a080e4..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Property/EmailAddressSetTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
- 'cs',
- 'DAV:' => 'd',
- ];
-
- function testSimple() {
-
- $eas = new EmailAddressSet(['foo@example.org']);
- $this->assertEquals(['foo@example.org'], $eas->getValue());
-
- }
-
- /**
- * @depends testSimple
- */
- function testSerialize() {
-
- $property = new EmailAddressSet(['foo@example.org']);
-
- $xml = $this->write([
- '{DAV:}root' => $property
- ]);
-
- $this->assertXmlStringEqualsXmlString(
-'
-
-foo@example.org
- ', $xml);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Property/InviteTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Property/InviteTest.php
deleted file mode 100644
index 1397dcca2b7..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Property/InviteTest.php
+++ /dev/null
@@ -1,112 +0,0 @@
-namespaceMap[CalDAV\Plugin::NS_CALDAV] = 'cal';
- $this->namespaceMap[CalDAV\Plugin::NS_CALENDARSERVER] = 'cs';
-
-
- }
-
- function testSimple() {
-
- $invite = new Invite([]);
- $this->assertInstanceOf('Sabre\CalDAV\Xml\Property\Invite', $invite);
- $this->assertEquals([], $invite->getValue());
-
- }
-
- /**
- * @depends testSimple
- */
- function testSerialize() {
-
- $property = new Invite([
- new Sharee([
- 'href' => 'mailto:thedoctor@example.org',
- 'properties' => ['{DAV:}displayname' => 'The Doctor'],
- 'inviteStatus' => SP::INVITE_ACCEPTED,
- 'access' => SP::ACCESS_SHAREDOWNER,
- ]),
- new Sharee([
- 'href' => 'mailto:user1@example.org',
- 'inviteStatus' => SP::INVITE_ACCEPTED,
- 'access' => SP::ACCESS_READWRITE,
- ]),
- new Sharee([
- 'href' => 'mailto:user2@example.org',
- 'properties' => ['{DAV:}displayname' => 'John Doe'],
- 'inviteStatus' => SP::INVITE_DECLINED,
- 'access' => SP::ACCESS_READ,
- ]),
- new Sharee([
- 'href' => 'mailto:user3@example.org',
- 'properties' => ['{DAV:}displayname' => 'Joe Shmoe'],
- 'inviteStatus' => SP::INVITE_NORESPONSE,
- 'access' => SP::ACCESS_READ,
- 'comment' => 'Something, something',
- ]),
- new Sharee([
- 'href' => 'mailto:user4@example.org',
- 'properties' => ['{DAV:}displayname' => 'Hoe Boe'],
- 'inviteStatus' => SP::INVITE_INVALID,
- 'access' => SP::ACCESS_READ,
- ]),
- ]);
-
- $xml = $this->write(['{DAV:}root' => $property]);
-
- $this->assertXmlStringEqualsXmlString(
-'
-
-
- mailto:thedoctor@example.org
- The Doctor
-
-
-
-
- mailto:user1@example.org
-
-
-
-
- mailto:user2@example.org
- John Doe
-
-
-
-
- mailto:user3@example.org
- Joe Shmoe
- Something, something
-
-
-
-
- mailto:user4@example.org
- Hoe Boe
-
-
-', $xml);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Property/ScheduleCalendarTranspTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Property/ScheduleCalendarTranspTest.php
deleted file mode 100644
index 729db4569e5..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Property/ScheduleCalendarTranspTest.php
+++ /dev/null
@@ -1,118 +0,0 @@
-namespaceMap[CalDAV\Plugin::NS_CALDAV] = 'cal';
- $this->namespaceMap[CalDAV\Plugin::NS_CALENDARSERVER] = 'cs';
-
-
- }
-
- function testSimple() {
-
- $prop = new ScheduleCalendarTransp(ScheduleCalendarTransp::OPAQUE);
- $this->assertEquals(
- ScheduleCalendarTransp::OPAQUE,
- $prop->getValue()
- );
-
- }
-
- /**
- * @expectedException \InvalidArgumentException
- */
- function testBadValue() {
-
- new ScheduleCalendarTransp('ahhh');
-
- }
-
- /**
- * @depends testSimple
- */
- function testSerializeOpaque() {
-
- $property = new ScheduleCalendarTransp(ScheduleCalendarTransp::OPAQUE);
- $xml = $this->write(['{DAV:}root' => $property]);
-
- $this->assertXmlStringEqualsXmlString(
-'
-
-
-', $xml);
-
- }
-
- /**
- * @depends testSimple
- */
- function testSerializeTransparent() {
-
- $property = new ScheduleCalendarTransp(ScheduleCalendarTransp::TRANSPARENT);
- $xml = $this->write(['{DAV:}root' => $property]);
-
- $this->assertXmlStringEqualsXmlString(
-'
-
-
-', $xml);
-
- }
-
- function testUnserializeTransparent() {
-
- $cal = CalDAV\Plugin::NS_CALDAV;
- $cs = CalDAV\Plugin::NS_CALENDARSERVER;
-
-$xml = <<
-
-
-XML;
-
- $result = $this->parse(
- $xml,
- ['{DAV:}root' => 'Sabre\\CalDAV\\Xml\\Property\\ScheduleCalendarTransp']
- );
-
- $this->assertEquals(
- new ScheduleCalendarTransp(ScheduleCalendarTransp::TRANSPARENT),
- $result['value']
- );
-
- }
-
- function testUnserializeOpaque() {
-
- $cal = CalDAV\Plugin::NS_CALDAV;
- $cs = CalDAV\Plugin::NS_CALENDARSERVER;
-
-$xml = <<
-
-
-XML;
-
- $result = $this->parse(
- $xml,
- ['{DAV:}root' => 'Sabre\\CalDAV\\Xml\\Property\\ScheduleCalendarTransp']
- );
-
- $this->assertEquals(
- new ScheduleCalendarTransp(ScheduleCalendarTransp::OPAQUE),
- $result['value']
- );
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Property/SupportedCalendarComponentSetTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Property/SupportedCalendarComponentSetTest.php
deleted file mode 100644
index 1acc402d36b..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Property/SupportedCalendarComponentSetTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-namespaceMap[CalDAV\Plugin::NS_CALDAV] = 'cal';
- $this->namespaceMap[CalDAV\Plugin::NS_CALENDARSERVER] = 'cs';
-
- }
-
- function testSimple() {
-
- $prop = new SupportedCalendarComponentSet(['VEVENT']);
- $this->assertEquals(
- ['VEVENT'],
- $prop->getValue()
- );
-
- }
-
- function testMultiple() {
-
- $prop = new SupportedCalendarComponentSet(['VEVENT', 'VTODO']);
- $this->assertEquals(
- ['VEVENT', 'VTODO'],
- $prop->getValue()
- );
-
- }
-
- /**
- * @depends testSimple
- * @depends testMultiple
- */
- function testSerialize() {
-
- $property = new SupportedCalendarComponentSet(['VEVENT', 'VTODO']);
- $xml = $this->write(['{DAV:}root' => $property]);
-
- $this->assertXmlStringEqualsXmlString(
-'
-
-
-', $xml);
-
- }
-
- function testUnserialize() {
-
- $cal = CalDAV\Plugin::NS_CALDAV;
- $cs = CalDAV\Plugin::NS_CALENDARSERVER;
-
-$xml = <<
-
-
-XML;
-
- $result = $this->parse(
- $xml,
- ['{DAV:}root' => 'Sabre\\CalDAV\\Xml\\Property\\SupportedCalendarComponentSet']
- );
-
- $this->assertEquals(
- new SupportedCalendarComponentSet(['VEVENT', 'VTODO']),
- $result['value']
- );
-
- }
-
- /**
- * @expectedException \Sabre\Xml\ParseException
- */
- function testUnserializeEmpty() {
-
- $cal = CalDAV\Plugin::NS_CALDAV;
- $cs = CalDAV\Plugin::NS_CALENDARSERVER;
-
-$xml = <<
-
-
-XML;
-
- $result = $this->parse(
- $xml,
- ['{DAV:}root' => 'Sabre\\CalDAV\\Xml\\Property\\SupportedCalendarComponentSet']
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Property/SupportedCalendarDataTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Property/SupportedCalendarDataTest.php
deleted file mode 100644
index 442b6a059f4..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Property/SupportedCalendarDataTest.php
+++ /dev/null
@@ -1,36 +0,0 @@
-assertInstanceOf('Sabre\CalDAV\Xml\Property\SupportedCalendarData', $sccs);
-
- }
-
- /**
- * @depends testSimple
- */
- function testSerialize() {
-
- $this->namespaceMap[CalDAV\Plugin::NS_CALDAV] = 'cal';
- $property = new SupportedCalendarData();
-
- $xml = $this->write(['{DAV:}root' => $property]);
-
- $this->assertXmlStringEqualsXmlString(
-'
-
- ', $xml);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Property/SupportedCollationSetTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Property/SupportedCollationSetTest.php
deleted file mode 100644
index e009fb6cd85..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Property/SupportedCollationSetTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-assertInstanceOf('Sabre\CalDAV\Xml\Property\SupportedCollationSet', $scs);
-
- }
-
- /**
- * @depends testSimple
- */
- function testSerialize() {
-
- $property = new SupportedCollationSet();
-
- $this->namespaceMap[CalDAV\Plugin::NS_CALDAV] = 'cal';
- $xml = $this->write(['{DAV:}root' => $property]);
-
- $this->assertXmlStringEqualsXmlString(
-'
-
-i;ascii-casemap
-i;octet
-i;unicode-casemap
- ', $xml);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Request/CalendarQueryReportTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Request/CalendarQueryReportTest.php
deleted file mode 100644
index d5e87db854b..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Request/CalendarQueryReportTest.php
+++ /dev/null
@@ -1,369 +0,0 @@
- 'Sabre\\CalDAV\\Xml\\Request\CalendarQueryReport',
- ];
-
- function testDeserialize() {
-
- $xml = <<
-
-
-
-
-
-
-XML;
-
- $result = $this->parse($xml);
- $calendarQueryReport = new CalendarQueryReport();
- $calendarQueryReport->properties = [
- '{DAV:}getetag',
- ];
- $calendarQueryReport->filters = [
- 'name' => 'VCALENDAR',
- 'is-not-defined' => false,
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'time-range' => false,
- ];
-
- $this->assertEquals(
- $calendarQueryReport,
- $result['value']
- );
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\BadRequest
- */
- function testDeserializeNoFilter() {
-
- $xml = <<
-
-
-
-
-XML;
-
- $this->parse($xml);
-
- }
-
- function testDeserializeComplex() {
-
- $xml = <<
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- hi
-
-
-
-
-
-
-
- Hello
-
-
-
-
-
-XML;
-
- $result = $this->parse($xml);
- $calendarQueryReport = new CalendarQueryReport();
- $calendarQueryReport->version = '2.0';
- $calendarQueryReport->contentType = 'application/json+calendar';
- $calendarQueryReport->properties = [
- '{DAV:}getetag',
- '{urn:ietf:params:xml:ns:caldav}calendar-data',
- ];
- $calendarQueryReport->expand = [
- 'start' => new DateTimeImmutable('2015-01-01 00:00:00', new DateTimeZone('UTC')),
- 'end' => new DateTimeImmutable('2016-01-01 00:00:00', new DateTimeZone('UTC')),
- ];
- $calendarQueryReport->filters = [
- 'name' => 'VCALENDAR',
- 'is-not-defined' => false,
- 'comp-filters' => [
- [
- 'name' => 'VEVENT',
- 'is-not-defined' => false,
- 'comp-filters' => [
- [
- 'name' => 'VALARM',
- 'is-not-defined' => true,
- 'comp-filters' => [],
- 'prop-filters' => [],
- 'time-range' => false,
- ],
- ],
- 'prop-filters' => [
- [
- 'name' => 'UID',
- 'is-not-defined' => false,
- 'time-range' => false,
- 'text-match' => null,
- 'param-filters' => [],
- ],
- [
- 'name' => 'X-PROP',
- 'is-not-defined' => false,
- 'time-range' => false,
- 'text-match' => null,
- 'param-filters' => [
- [
- 'name' => 'X-PARAM',
- 'is-not-defined' => false,
- 'text-match' => null,
- ],
- [
- 'name' => 'X-PARAM2',
- 'is-not-defined' => true,
- 'text-match' => null,
- ],
- [
- 'name' => 'X-PARAM3',
- 'is-not-defined' => false,
- 'text-match' => [
- 'negate-condition' => true,
- 'collation' => 'i;ascii-casemap',
- 'value' => 'hi',
- ],
- ],
- ],
- ],
- [
- 'name' => 'X-PROP2',
- 'is-not-defined' => true,
- 'time-range' => false,
- 'text-match' => null,
- 'param-filters' => [],
- ],
- [
- 'name' => 'X-PROP3',
- 'is-not-defined' => false,
- 'time-range' => [
- 'start' => new DateTimeImmutable('2015-01-01 00:00:00', new DateTimeZone('UTC')),
- 'end' => new DateTimeImmutable('2016-01-01 00:00:00', new DateTimeZone('UTC')),
- ],
- 'text-match' => null,
- 'param-filters' => [],
- ],
- [
- 'name' => 'X-PROP4',
- 'is-not-defined' => false,
- 'time-range' => false,
- 'text-match' => [
- 'negate-condition' => false,
- 'collation' => 'i;ascii-casemap',
- 'value' => 'Hello',
- ],
- 'param-filters' => [],
- ],
- ],
- 'time-range' => [
- 'start' => new DateTimeImmutable('2015-01-01 00:00:00', new DateTimeZone('UTC')),
- 'end' => new DateTimeImmutable('2016-01-01 00:00:00', new DateTimeZone('UTC')),
- ]
- ],
- ],
- 'prop-filters' => [],
- 'time-range' => false,
- ];
-
- $this->assertEquals(
- $calendarQueryReport,
- $result['value']
- );
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\BadRequest
- */
- function testDeserializeDoubleTopCompFilter() {
-
- $xml = <<
-
-
-
-
-
-
-
-
-XML;
-
- $this->parse($xml);
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\BadRequest
- */
- function testDeserializeMissingExpandEnd() {
-
- $xml = <<
-
-
-
-
-
-
-
-
-XML;
-
- $this->parse($xml);
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\BadRequest
- */
- function testDeserializeExpandEndBeforeStart() {
-
- $xml = <<
-
-
-
-
-
-
-
-
-XML;
-
- $this->parse($xml);
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\BadRequest
- */
- function testDeserializeTimeRangeOnVCALENDAR() {
-
- $xml = <<
-
-
-
-
-
-
-
-
-XML;
-
- $this->parse($xml);
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\BadRequest
- */
- function testDeserializeTimeRangeEndBeforeStart() {
-
- $xml = <<
-
-
-
-
-
-
-
-
-
-
-XML;
-
- $this->parse($xml);
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\BadRequest
- */
- function testDeserializeTimeRangePropEndBeforeStart() {
-
- $xml = <<
-
-
-
-
-
-
-
-
-
-
-
-
-XML;
-
- $this->parse($xml);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Request/InviteReplyTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Request/InviteReplyTest.php
deleted file mode 100644
index b0770899914..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Request/InviteReplyTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
- 'Sabre\\CalDAV\\Xml\\Request\\InviteReply',
- ];
-
- function testDeserialize() {
-
- $xml = <<
-
- /principal/1
- /calendar/1 blabla
- Summary
-
-XML;
-
- $result = $this->parse($xml);
- $inviteReply = new InviteReply('/principal/1', '/calendar/1', 'blabla', 'Summary', DAV\Sharing\Plugin::INVITE_ACCEPTED);
-
- $this->assertEquals(
- $inviteReply,
- $result['value']
- );
-
- }
-
- function testDeserializeDeclined() {
-
- $xml = <<
-
- /principal/1
- /calendar/1 blabla
- Summary
-
-XML;
-
- $result = $this->parse($xml);
- $inviteReply = new InviteReply('/principal/1', '/calendar/1', 'blabla', 'Summary', DAV\Sharing\Plugin::INVITE_DECLINED);
-
- $this->assertEquals(
- $inviteReply,
- $result['value']
- );
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\BadRequest
- */
- function testDeserializeNoHostUrl() {
-
- $xml = <<
-
- /principal/1
- blabla
- Summary
-
-XML;
-
- $this->parse($xml);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Request/ShareTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Request/ShareTest.php
deleted file mode 100644
index 73a2c3a13d2..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CalDAV/Xml/Request/ShareTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
- 'Sabre\\CalDAV\\Xml\\Request\\Share',
- ];
-
- function testDeserialize() {
-
- $xml = <<
-
-
- mailto:eric@example.com
- Eric York
- Shared workspace
-
-
- mailto:foo@bar
-
-
-XML;
-
- $result = $this->parse($xml);
- $share = new Share([
- new Sharee([
- 'href' => 'mailto:eric@example.com',
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READWRITE,
- 'properties' => [
- '{DAV:}displayname' => 'Eric York',
- ],
- 'comment' => 'Shared workspace',
- ]),
- new Sharee([
- 'href' => 'mailto:foo@bar',
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_NOACCESS,
- ]),
- ]);
-
- $this->assertEquals(
- $share,
- $result['value']
- );
-
- }
-
- function testDeserializeMinimal() {
-
- $xml = <<
-
-
- mailto:eric@example.com
-
-
-XML;
-
- $result = $this->parse($xml);
- $share = new Share([
- new Sharee([
- 'href' => 'mailto:eric@example.com',
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READ,
- ]),
- ]);
-
- $this->assertEquals(
- $share,
- $result['value']
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/AbstractPluginTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/AbstractPluginTest.php
deleted file mode 100644
index 552e2ba77e5..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/AbstractPluginTest.php
+++ /dev/null
@@ -1,43 +0,0 @@
-backend = new Backend\Mock();
- $principalBackend = new DAVACL\PrincipalBackend\Mock();
-
- $tree = [
- new AddressBookRoot($principalBackend, $this->backend),
- new DAVACL\PrincipalCollection($principalBackend)
- ];
-
- $this->plugin = new Plugin();
- $this->plugin->directories = ['directory'];
- $this->server = new DAV\Server($tree);
- $this->server->sapi = new HTTP\SapiMock();
- $this->server->addPlugin($this->plugin);
- $this->server->debugExceptions = true;
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/AddressBookHomeTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/AddressBookHomeTest.php
deleted file mode 100644
index 871f4a457c1..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/AddressBookHomeTest.php
+++ /dev/null
@@ -1,159 +0,0 @@
-backend = new Backend\Mock();
- $this->s = new AddressBookHome(
- $this->backend,
- 'principals/user1'
- );
-
- }
-
- function testGetName() {
-
- $this->assertEquals('user1', $this->s->getName());
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\MethodNotAllowed
- */
- function testSetName() {
-
- $this->s->setName('user2');
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\MethodNotAllowed
- */
- function testDelete() {
-
- $this->s->delete();
-
- }
-
- function testGetLastModified() {
-
- $this->assertNull($this->s->getLastModified());
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\MethodNotAllowed
- */
- function testCreateFile() {
-
- $this->s->createFile('bla');
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\MethodNotAllowed
- */
- function testCreateDirectory() {
-
- $this->s->createDirectory('bla');
-
- }
-
- function testGetChild() {
-
- $child = $this->s->getChild('book1');
- $this->assertInstanceOf('Sabre\\CardDAV\\AddressBook', $child);
- $this->assertEquals('book1', $child->getName());
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\NotFound
- */
- function testGetChild404() {
-
- $this->s->getChild('book2');
-
- }
-
- function testGetChildren() {
-
- $children = $this->s->getChildren();
- $this->assertEquals(2, count($children));
- $this->assertInstanceOf('Sabre\\CardDAV\\AddressBook', $children[0]);
- $this->assertEquals('book1', $children[0]->getName());
-
- }
-
- function testCreateExtendedCollection() {
-
- $resourceType = [
- '{' . Plugin::NS_CARDDAV . '}addressbook',
- '{DAV:}collection',
- ];
- $this->s->createExtendedCollection('book2', new MkCol($resourceType, ['{DAV:}displayname' => 'a-book 2']));
-
- $this->assertEquals([
- 'id' => 'book2',
- 'uri' => 'book2',
- '{DAV:}displayname' => 'a-book 2',
- 'principaluri' => 'principals/user1',
- ], $this->backend->addressBooks[2]);
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\InvalidResourceType
- */
- function testCreateExtendedCollectionInvalid() {
-
- $resourceType = [
- '{DAV:}collection',
- ];
- $this->s->createExtendedCollection('book2', new MkCol($resourceType, ['{DAV:}displayname' => 'a-book 2']));
-
- }
-
-
- function testACLMethods() {
-
- $this->assertEquals('principals/user1', $this->s->getOwner());
- $this->assertNull($this->s->getGroup());
- $this->assertEquals([
- [
- 'privilege' => '{DAV:}all',
- 'principal' => '{DAV:}owner',
- 'protected' => true,
- ],
- ], $this->s->getACL());
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\Forbidden
- */
- function testSetACL() {
-
- $this->s->setACL([]);
-
- }
-
- function testGetSupportedPrivilegeSet() {
-
- $this->assertNull(
- $this->s->getSupportedPrivilegeSet()
- );
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/AddressBookQueryTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/AddressBookQueryTest.php
deleted file mode 100644
index f8da38a16dc..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/AddressBookQueryTest.php
+++ /dev/null
@@ -1,355 +0,0 @@
- '1']
- );
-
- $request->setBody(
-'
-
-
-
-
-
- '
- );
-
- $response = new HTTP\ResponseMock();
-
- $this->server->httpRequest = $request;
- $this->server->httpResponse = $response;
-
- $this->server->exec();
-
- $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:' . $response->body);
-
- // using the client for parsing
- $client = new DAV\Client(['baseUri' => '/']);
-
- $result = $client->parseMultiStatus($response->body);
-
- $this->assertEquals([
- '/addressbooks/user1/book1/card1' => [
- 200 => [
- '{DAV:}getetag' => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD") . '"',
- ],
- ],
- '/addressbooks/user1/book1/card2' => [
- 404 => [
- '{DAV:}getetag' => null,
- ],
- ]
- ], $result);
-
-
- }
-
- function testQueryDepth0() {
-
- $request = new HTTP\Request(
- 'REPORT',
- '/addressbooks/user1/book1/card1',
- ['Depth' => '0']
- );
-
- $request->setBody(
-'
-
-
-
-
-
- '
- );
-
- $response = new HTTP\ResponseMock();
-
- $this->server->httpRequest = $request;
- $this->server->httpResponse = $response;
-
- $this->server->exec();
-
- $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:' . $response->body);
-
- // using the client for parsing
- $client = new DAV\Client(['baseUri' => '/']);
-
- $result = $client->parseMultiStatus($response->body);
-
- $this->assertEquals([
- '/addressbooks/user1/book1/card1' => [
- 200 => [
- '{DAV:}getetag' => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD") . '"',
- ],
- ],
- ], $result);
-
-
- }
-
- function testQueryNoMatch() {
-
- $request = new HTTP\Request(
- 'REPORT',
- '/addressbooks/user1/book1',
- ['Depth' => '1']
- );
-
- $request->setBody(
-'
-
-
-
-
-
- '
- );
-
- $response = new HTTP\ResponseMock();
-
- $this->server->httpRequest = $request;
- $this->server->httpResponse = $response;
-
- $this->server->exec();
-
- $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:' . $response->body);
-
- // using the client for parsing
- $client = new DAV\Client(['baseUri' => '/']);
-
- $result = $client->parseMultiStatus($response->body);
-
- $this->assertEquals([], $result);
-
- }
-
- function testQueryLimit() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'REPORT',
- 'REQUEST_URI' => '/addressbooks/user1/book1',
- 'HTTP_DEPTH' => '1',
- ]);
-
- $request->setBody(
-'
-
-
-
-
-
- 1 '
- );
-
- $response = new HTTP\ResponseMock();
-
- $this->server->httpRequest = $request;
- $this->server->httpResponse = $response;
-
- $this->server->exec();
-
- $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:' . $response->body);
-
- // using the client for parsing
- $client = new DAV\Client(['baseUri' => '/']);
-
- $result = $client->parseMultiStatus($response->body);
-
- $this->assertEquals([
- '/addressbooks/user1/book1/card1' => [
- 200 => [
- '{DAV:}getetag' => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD") . '"',
- ],
- ],
- ], $result);
-
-
- }
-
- function testJson() {
-
- $request = new HTTP\Request(
- 'REPORT',
- '/addressbooks/user1/book1/card1',
- ['Depth' => '0']
- );
-
- $request->setBody(
-'
-
-
-
- '
- );
-
- $response = new HTTP\ResponseMock();
-
- $this->server->httpRequest = $request;
- $this->server->httpResponse = $response;
-
- $this->server->exec();
-
- $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:' . $response->body);
-
- // using the client for parsing
- $client = new DAV\Client(['baseUri' => '/']);
-
- $result = $client->parseMultiStatus($response->body);
-
- $vobjVersion = \Sabre\VObject\Version::VERSION;
-
- $this->assertEquals([
- '/addressbooks/user1/book1/card1' => [
- 200 => [
- '{DAV:}getetag' => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD") . '"',
- '{urn:ietf:params:xml:ns:carddav}address-data' => '["vcard",[["version",{},"text","4.0"],["prodid",{},"text","-\/\/Sabre\/\/Sabre VObject ' . $vobjVersion . '\/\/EN"],["uid",{},"text","12345"]]]',
- ],
- ],
- ], $result);
-
- }
-
- function testVCard4() {
-
- $request = new HTTP\Request(
- 'REPORT',
- '/addressbooks/user1/book1/card1',
- ['Depth' => '0']
- );
-
- $request->setBody(
-'
-
-
-
- '
- );
-
- $response = new HTTP\ResponseMock();
-
- $this->server->httpRequest = $request;
- $this->server->httpResponse = $response;
-
- $this->server->exec();
-
- $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:' . $response->body);
-
- // using the client for parsing
- $client = new DAV\Client(['baseUri' => '/']);
-
- $result = $client->parseMultiStatus($response->body);
-
- $vobjVersion = \Sabre\VObject\Version::VERSION;
-
- $this->assertEquals([
- '/addressbooks/user1/book1/card1' => [
- 200 => [
- '{DAV:}getetag' => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD") . '"',
- '{urn:ietf:params:xml:ns:carddav}address-data' => "BEGIN:VCARD\r\nVERSION:4.0\r\nPRODID:-//Sabre//Sabre VObject $vobjVersion//EN\r\nUID:12345\r\nEND:VCARD\r\n",
- ],
- ],
- ], $result);
-
- }
-
- function testAddressBookDepth0() {
-
- $request = new HTTP\Request(
- 'REPORT',
- '/addressbooks/user1/book1',
- ['Depth' => '0']
- );
-
- $request->setBody(
- '
-
-
-
- '
- );
-
- $response = new HTTP\ResponseMock();
-
- $this->server->httpRequest = $request;
- $this->server->httpResponse = $response;
-
- $this->server->exec();
-
- $this->assertEquals(415, $response->status, 'Incorrect status code. Full response body:' . $response->body);
- }
-
- function testAddressBookProperties() {
-
- $request = new HTTP\Request(
- 'REPORT',
- '/addressbooks/user1/book3',
- ['Depth' => '1']
- );
-
- $request->setBody(
- '
-
-
-
-
-
- '
- );
-
- $response = new HTTP\ResponseMock();
-
- $this->server->httpRequest = $request;
- $this->server->httpResponse = $response;
-
- $this->server->exec();
-
- $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:' . $response->body);
-
- // using the client for parsing
- $client = new DAV\Client(['baseUri' => '/']);
-
- $result = $client->parseMultiStatus($response->body);
-
- $this->assertEquals([
- '/addressbooks/user1/book3/card3' => [
- 200 => [
- '{DAV:}getetag' => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nFN:Test-Card\nEMAIL;TYPE=home:bar@example.org\nEND:VCARD") . '"',
- '{urn:ietf:params:xml:ns:carddav}address-data' => "BEGIN:VCARD\r\nVERSION:3.0\r\nUID:12345\r\nFN:Test-Card\r\nEND:VCARD\r\n",
- ],
- ],
- ], $result);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/AddressBookRootTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/AddressBookRootTest.php
deleted file mode 100644
index fc20480f2d4..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/AddressBookRootTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-assertEquals('addressbooks', $root->getName());
-
- }
-
- function testGetChildForPrincipal() {
-
- $pBackend = new DAVACL\PrincipalBackend\Mock();
- $cBackend = new Backend\Mock();
- $root = new AddressBookRoot($pBackend, $cBackend);
-
- $children = $root->getChildren();
- $this->assertEquals(3, count($children));
-
- $this->assertInstanceOf('Sabre\\CardDAV\\AddressBookHome', $children[0]);
- $this->assertEquals('user1', $children[0]->getName());
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/AddressBookTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/AddressBookTest.php
deleted file mode 100644
index 1f0064dd38a..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/AddressBookTest.php
+++ /dev/null
@@ -1,194 +0,0 @@
-backend = new Backend\Mock();
- $this->ab = new AddressBook(
- $this->backend,
- [
- 'uri' => 'book1',
- 'id' => 'foo',
- '{DAV:}displayname' => 'd-name',
- 'principaluri' => 'principals/user1',
- ]
- );
-
- }
-
- function testGetName() {
-
- $this->assertEquals('book1', $this->ab->getName());
-
- }
-
- function testGetChild() {
-
- $card = $this->ab->getChild('card1');
- $this->assertInstanceOf('Sabre\\CardDAV\\Card', $card);
- $this->assertEquals('card1', $card->getName());
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\NotFound
- */
- function testGetChildNotFound() {
-
- $card = $this->ab->getChild('card3');
-
- }
-
- function testGetChildren() {
-
- $cards = $this->ab->getChildren();
- $this->assertEquals(2, count($cards));
-
- $this->assertEquals('card1', $cards[0]->getName());
- $this->assertEquals('card2', $cards[1]->getName());
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\MethodNotAllowed
- */
- function testCreateDirectory() {
-
- $this->ab->createDirectory('name');
-
- }
-
- function testCreateFile() {
-
- $file = fopen('php://memory', 'r+');
- fwrite($file, 'foo');
- rewind($file);
- $this->ab->createFile('card2', $file);
-
- $this->assertEquals('foo', $this->backend->cards['foo']['card2']);
-
- }
-
- function testDelete() {
-
- $this->ab->delete();
- $this->assertEquals(1, count($this->backend->addressBooks));
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\MethodNotAllowed
- */
- function testSetName() {
-
- $this->ab->setName('foo');
-
- }
-
- function testGetLastModified() {
-
- $this->assertNull($this->ab->getLastModified());
-
- }
-
- function testUpdateProperties() {
-
- $propPatch = new PropPatch([
- '{DAV:}displayname' => 'barrr',
- ]);
- $this->ab->propPatch($propPatch);
- $this->assertTrue($propPatch->commit());
-
- $this->assertEquals('barrr', $this->backend->addressBooks[0]['{DAV:}displayname']);
-
- }
-
- function testGetProperties() {
-
- $props = $this->ab->getProperties(['{DAV:}displayname']);
- $this->assertEquals([
- '{DAV:}displayname' => 'd-name',
- ], $props);
-
- }
-
- function testACLMethods() {
-
- $this->assertEquals('principals/user1', $this->ab->getOwner());
- $this->assertNull($this->ab->getGroup());
- $this->assertEquals([
- [
- 'privilege' => '{DAV:}all',
- 'principal' => '{DAV:}owner',
- 'protected' => true,
- ],
- ], $this->ab->getACL());
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\Forbidden
- */
- function testSetACL() {
-
- $this->ab->setACL([]);
-
- }
-
- function testGetSupportedPrivilegeSet() {
-
- $this->assertNull(
- $this->ab->getSupportedPrivilegeSet()
- );
-
- }
-
- function testGetSyncTokenNoSyncSupport() {
-
- $this->assertNull($this->ab->getSyncToken());
-
- }
- function testGetChangesNoSyncSupport() {
-
- $this->assertNull($this->ab->getChanges(1, null));
-
- }
-
- function testGetSyncToken() {
-
- $this->driver = 'sqlite';
- $this->dropTables(['addressbooks', 'cards', 'addressbookchanges']);
- $this->createSchema('addressbooks');
- $backend = new Backend\PDO(
- $this->getPDO()
- );
- $ab = new AddressBook($backend, ['id' => 1, '{DAV:}sync-token' => 2]);
- $this->assertEquals(2, $ab->getSyncToken());
- }
-
- function testGetSyncToken2() {
-
- $this->driver = 'sqlite';
- $this->dropTables(['addressbooks', 'cards', 'addressbookchanges']);
- $this->createSchema('addressbooks');
- $backend = new Backend\PDO(
- $this->getPDO()
- );
- $ab = new AddressBook($backend, ['id' => 1, '{http://sabredav.org/ns}sync-token' => 2]);
- $this->assertEquals(2, $ab->getSyncToken());
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php
deleted file mode 100644
index f62bfb1ae68..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Backend/AbstractPDOTest.php
+++ /dev/null
@@ -1,373 +0,0 @@
-dropTables([
- 'addressbooks',
- 'cards',
- 'addressbookchanges',
- ]);
- $this->createSchema('addressbooks');
- $pdo = $this->getPDO();
-
- $this->backend = new PDO($pdo);
- $pdo->exec("INSERT INTO addressbooks (principaluri, displayname, uri, description, synctoken) VALUES ('principals/user1', 'book1', 'book1', 'addressbook 1', 1)");
- $pdo->exec("INSERT INTO cards (addressbookid, carddata, uri, lastmodified, etag, size) VALUES (1, 'card1', 'card1', 0, '" . md5('card1') . "', 5)");
-
- }
-
- function testGetAddressBooksForUser() {
-
- $result = $this->backend->getAddressBooksForUser('principals/user1');
-
- $expected = [
- [
- 'id' => 1,
- 'uri' => 'book1',
- 'principaluri' => 'principals/user1',
- '{DAV:}displayname' => 'book1',
- '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => 'addressbook 1',
- '{http://calendarserver.org/ns/}getctag' => 1,
- '{http://sabredav.org/ns}sync-token' => 1
- ]
- ];
-
- $this->assertEquals($expected, $result);
-
- }
-
- function testUpdateAddressBookInvalidProp() {
-
- $propPatch = new PropPatch([
- '{DAV:}displayname' => 'updated',
- '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => 'updated',
- '{DAV:}foo' => 'bar',
- ]);
-
- $this->backend->updateAddressBook(1, $propPatch);
- $result = $propPatch->commit();
-
- $this->assertFalse($result);
-
- $result = $this->backend->getAddressBooksForUser('principals/user1');
-
- $expected = [
- [
- 'id' => 1,
- 'uri' => 'book1',
- 'principaluri' => 'principals/user1',
- '{DAV:}displayname' => 'book1',
- '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => 'addressbook 1',
- '{http://calendarserver.org/ns/}getctag' => 1,
- '{http://sabredav.org/ns}sync-token' => 1
- ]
- ];
-
- $this->assertEquals($expected, $result);
-
- }
-
- function testUpdateAddressBookNoProps() {
-
- $propPatch = new PropPatch([
- ]);
-
- $this->backend->updateAddressBook(1, $propPatch);
- $result = $propPatch->commit();
- $this->assertTrue($result);
-
- $result = $this->backend->getAddressBooksForUser('principals/user1');
-
- $expected = [
- [
- 'id' => 1,
- 'uri' => 'book1',
- 'principaluri' => 'principals/user1',
- '{DAV:}displayname' => 'book1',
- '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => 'addressbook 1',
- '{http://calendarserver.org/ns/}getctag' => 1,
- '{http://sabredav.org/ns}sync-token' => 1
- ]
- ];
-
- $this->assertEquals($expected, $result);
-
-
- }
-
- function testUpdateAddressBookSuccess() {
-
- $propPatch = new PropPatch([
- '{DAV:}displayname' => 'updated',
- '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => 'updated',
- ]);
-
- $this->backend->updateAddressBook(1, $propPatch);
- $result = $propPatch->commit();
-
- $this->assertTrue($result);
-
- $result = $this->backend->getAddressBooksForUser('principals/user1');
-
- $expected = [
- [
- 'id' => 1,
- 'uri' => 'book1',
- 'principaluri' => 'principals/user1',
- '{DAV:}displayname' => 'updated',
- '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => 'updated',
- '{http://calendarserver.org/ns/}getctag' => 2,
- '{http://sabredav.org/ns}sync-token' => 2
- ]
- ];
-
- $this->assertEquals($expected, $result);
-
-
- }
-
- function testDeleteAddressBook() {
-
- $this->backend->deleteAddressBook(1);
-
- $this->assertEquals([], $this->backend->getAddressBooksForUser('principals/user1'));
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\BadRequest
- */
- function testCreateAddressBookUnsupportedProp() {
-
- $this->backend->createAddressBook('principals/user1', 'book2', [
- '{DAV:}foo' => 'bar',
- ]);
-
- }
-
- function testCreateAddressBookSuccess() {
-
- $this->backend->createAddressBook('principals/user1', 'book2', [
- '{DAV:}displayname' => 'book2',
- '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => 'addressbook 2',
- ]);
-
- $expected = [
- [
- 'id' => 1,
- 'uri' => 'book1',
- 'principaluri' => 'principals/user1',
- '{DAV:}displayname' => 'book1',
- '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => 'addressbook 1',
- '{http://calendarserver.org/ns/}getctag' => 1,
- '{http://sabredav.org/ns}sync-token' => 1,
- ],
- [
- 'id' => 2,
- 'uri' => 'book2',
- 'principaluri' => 'principals/user1',
- '{DAV:}displayname' => 'book2',
- '{' . CardDAV\Plugin::NS_CARDDAV . '}addressbook-description' => 'addressbook 2',
- '{http://calendarserver.org/ns/}getctag' => 1,
- '{http://sabredav.org/ns}sync-token' => 1,
- ]
- ];
- $result = $this->backend->getAddressBooksForUser('principals/user1');
- $this->assertEquals($expected, $result);
-
- }
-
- function testGetCards() {
-
- $result = $this->backend->getCards(1);
-
- $expected = [
- [
- 'id' => 1,
- 'uri' => 'card1',
- 'lastmodified' => 0,
- 'etag' => '"' . md5('card1') . '"',
- 'size' => 5
- ]
- ];
-
- $this->assertEquals($expected, $result);
-
- }
-
- function testGetCard() {
-
- $result = $this->backend->getCard(1, 'card1');
-
- $expected = [
- 'id' => 1,
- 'uri' => 'card1',
- 'carddata' => 'card1',
- 'lastmodified' => 0,
- 'etag' => '"' . md5('card1') . '"',
- 'size' => 5
- ];
-
- if (is_resource($result['carddata'])) {
- $result['carddata'] = stream_get_contents($result['carddata']);
- }
-
- $this->assertEquals($expected, $result);
-
- }
-
- /**
- * @depends testGetCard
- */
- function testCreateCard() {
-
- $result = $this->backend->createCard(1, 'card2', 'data2');
- $this->assertEquals('"' . md5('data2') . '"', $result);
- $result = $this->backend->getCard(1, 'card2');
- $this->assertEquals(2, $result['id']);
- $this->assertEquals('card2', $result['uri']);
- if (is_resource($result['carddata'])) {
- $result['carddata'] = stream_get_contents($result['carddata']);
- }
- $this->assertEquals('data2', $result['carddata']);
-
- }
-
- /**
- * @depends testCreateCard
- */
- function testGetMultiple() {
-
- $result = $this->backend->createCard(1, 'card2', 'data2');
- $result = $this->backend->createCard(1, 'card3', 'data3');
- $check = [
- [
- 'id' => 1,
- 'uri' => 'card1',
- 'carddata' => 'card1',
- 'lastmodified' => 0,
- ],
- [
- 'id' => 2,
- 'uri' => 'card2',
- 'carddata' => 'data2',
- 'lastmodified' => time(),
- ],
- [
- 'id' => 3,
- 'uri' => 'card3',
- 'carddata' => 'data3',
- 'lastmodified' => time(),
- ],
- ];
-
- $result = $this->backend->getMultipleCards(1, ['card1', 'card2', 'card3']);
-
- foreach ($check as $index => $node) {
-
- foreach ($node as $k => $v) {
-
- $expected = $v;
- $actual = $result[$index][$k];
-
- switch ($k) {
- case 'lastmodified' :
- $this->assertInternalType('int', $actual);
- break;
- case 'carddata' :
- if (is_resource($actual)) {
- $actual = stream_get_contents($actual);
- }
- // No break intended.
- default :
- $this->assertEquals($expected, $actual);
- break;
- }
-
- }
-
- }
-
-
- }
-
- /**
- * @depends testGetCard
- */
- function testUpdateCard() {
-
- $result = $this->backend->updateCard(1, 'card1', 'newdata');
- $this->assertEquals('"' . md5('newdata') . '"', $result);
-
- $result = $this->backend->getCard(1, 'card1');
- $this->assertEquals(1, $result['id']);
- if (is_resource($result['carddata'])) {
- $result['carddata'] = stream_get_contents($result['carddata']);
- }
- $this->assertEquals('newdata', $result['carddata']);
-
- }
-
- /**
- * @depends testGetCard
- */
- function testDeleteCard() {
-
- $this->backend->deleteCard(1, 'card1');
- $result = $this->backend->getCard(1, 'card1');
- $this->assertFalse($result);
-
- }
-
- function testGetChanges() {
-
- $backend = $this->backend;
- $id = $backend->createAddressBook(
- 'principals/user1',
- 'bla',
- []
- );
- $result = $backend->getChangesForAddressBook($id, null, 1);
-
- $this->assertEquals([
- 'syncToken' => 1,
- "added" => [],
- 'modified' => [],
- 'deleted' => [],
- ], $result);
-
- $currentToken = $result['syncToken'];
-
- $dummyCard = "BEGIN:VCARD\r\nEND:VCARD\r\n";
-
- $backend->createCard($id, "card1.ics", $dummyCard);
- $backend->createCard($id, "card2.ics", $dummyCard);
- $backend->createCard($id, "card3.ics", $dummyCard);
- $backend->updateCard($id, "card1.ics", $dummyCard);
- $backend->deleteCard($id, "card2.ics");
-
- $result = $backend->getChangesForAddressBook($id, $currentToken, 1);
-
- $this->assertEquals([
- 'syncToken' => 6,
- 'modified' => ["card1.ics"],
- 'deleted' => ["card2.ics"],
- "added" => ["card3.ics"],
- ], $result);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Backend/Mock.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Backend/Mock.php
deleted file mode 100644
index 8638dc74a65..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Backend/Mock.php
+++ /dev/null
@@ -1,258 +0,0 @@
-addressBooks = $addressBooks;
- $this->cards = $cards;
-
- if (is_null($this->addressBooks)) {
- $this->addressBooks = [
- [
- 'id' => 'foo',
- 'uri' => 'book1',
- 'principaluri' => 'principals/user1',
- '{DAV:}displayname' => 'd-name',
- ],
- [
- 'id' => 'bar',
- 'uri' => 'book3',
- 'principaluri' => 'principals/user1',
- '{DAV:}displayname' => 'd-name',
- ],
- ];
-
- $card2 = fopen('php://memory', 'r+');
- fwrite($card2, "BEGIN:VCARD\nVERSION:3.0\nUID:45678\nEND:VCARD");
- rewind($card2);
- $this->cards = [
- 'foo' => [
- 'card1' => "BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD",
- 'card2' => $card2,
- ],
- 'bar' => [
- 'card3' => "BEGIN:VCARD\nVERSION:3.0\nUID:12345\nFN:Test-Card\nEMAIL;TYPE=home:bar@example.org\nEND:VCARD",
- ],
- ];
- }
-
- }
-
-
- function getAddressBooksForUser($principalUri) {
-
- $books = [];
- foreach ($this->addressBooks as $book) {
- if ($book['principaluri'] === $principalUri) {
- $books[] = $book;
- }
- }
- return $books;
-
- }
-
- /**
- * Updates properties for an address book.
- *
- * The list of mutations is stored in a Sabre\DAV\PropPatch object.
- * To do the actual updates, you must tell this object which properties
- * you're going to process with the handle() method.
- *
- * Calling the handle method is like telling the PropPatch object "I
- * promise I can handle updating this property".
- *
- * Read the PropPatch documentation for more info and examples.
- *
- * @param string $addressBookId
- * @param \Sabre\DAV\PropPatch $propPatch
- * @return void
- */
- function updateAddressBook($addressBookId, \Sabre\DAV\PropPatch $propPatch) {
-
- foreach ($this->addressBooks as &$book) {
- if ($book['id'] !== $addressBookId)
- continue;
-
- $propPatch->handleRemaining(function($mutations) use (&$book) {
- foreach ($mutations as $key => $value) {
- $book[$key] = $value;
- }
- return true;
- });
-
- }
-
- }
-
- function createAddressBook($principalUri, $url, array $properties) {
-
- $this->addressBooks[] = array_merge($properties, [
- 'id' => $url,
- 'uri' => $url,
- 'principaluri' => $principalUri,
- ]);
-
- }
-
- function deleteAddressBook($addressBookId) {
-
- foreach ($this->addressBooks as $key => $value) {
- if ($value['id'] === $addressBookId)
- unset($this->addressBooks[$key]);
- }
- unset($this->cards[$addressBookId]);
-
- }
-
- /**
- * Returns all cards for a specific addressbook id.
- *
- * This method should return the following properties for each card:
- * * carddata - raw vcard data
- * * uri - Some unique url
- * * lastmodified - A unix timestamp
- *
- * It's recommended to also return the following properties:
- * * etag - A unique etag. This must change every time the card changes.
- * * size - The size of the card in bytes.
- *
- * If these last two properties are provided, less time will be spent
- * calculating them. If they are specified, you can also ommit carddata.
- * This may speed up certain requests, especially with large cards.
- *
- * @param mixed $addressBookId
- * @return array
- */
- function getCards($addressBookId) {
-
- $cards = [];
- foreach ($this->cards[$addressBookId] as $uri => $data) {
- if (is_resource($data)) {
- $cards[] = [
- 'uri' => $uri,
- 'carddata' => $data,
- ];
- } else {
- $cards[] = [
- 'uri' => $uri,
- 'carddata' => $data,
- 'etag' => '"' . md5($data) . '"',
- 'size' => strlen($data)
- ];
- }
- }
- return $cards;
-
- }
-
- /**
- * Returns a specfic card.
- *
- * The same set of properties must be returned as with getCards. The only
- * exception is that 'carddata' is absolutely required.
- *
- * If the card does not exist, you must return false.
- *
- * @param mixed $addressBookId
- * @param string $cardUri
- * @return array
- */
- function getCard($addressBookId, $cardUri) {
-
- if (!isset($this->cards[$addressBookId][$cardUri])) {
- return false;
- }
-
- $data = $this->cards[$addressBookId][$cardUri];
- return [
- 'uri' => $cardUri,
- 'carddata' => $data,
- 'etag' => '"' . md5($data) . '"',
- 'size' => strlen($data)
- ];
-
- }
-
- /**
- * Creates a new card.
- *
- * The addressbook id will be passed as the first argument. This is the
- * same id as it is returned from the getAddressBooksForUser method.
- *
- * The cardUri is a base uri, and doesn't include the full path. The
- * cardData argument is the vcard body, and is passed as a string.
- *
- * It is possible to return an ETag from this method. This ETag is for the
- * newly created resource, and must be enclosed with double quotes (that
- * is, the string itself must contain the double quotes).
- *
- * You should only return the ETag if you store the carddata as-is. If a
- * subsequent GET request on the same card does not have the same body,
- * byte-by-byte and you did return an ETag here, clients tend to get
- * confused.
- *
- * If you don't return an ETag, you can just return null.
- *
- * @param mixed $addressBookId
- * @param string $cardUri
- * @param string $cardData
- * @return string|null
- */
- function createCard($addressBookId, $cardUri, $cardData) {
-
- if (is_resource($cardData)) {
- $cardData = stream_get_contents($cardData);
- }
- $this->cards[$addressBookId][$cardUri] = $cardData;
- return '"' . md5($cardData) . '"';
-
- }
-
- /**
- * Updates a card.
- *
- * The addressbook id will be passed as the first argument. This is the
- * same id as it is returned from the getAddressBooksForUser method.
- *
- * The cardUri is a base uri, and doesn't include the full path. The
- * cardData argument is the vcard body, and is passed as a string.
- *
- * It is possible to return an ETag from this method. This ETag should
- * match that of the updated resource, and must be enclosed with double
- * quotes (that is: the string itself must contain the actual quotes).
- *
- * You should only return the ETag if you store the carddata as-is. If a
- * subsequent GET request on the same card does not have the same body,
- * byte-by-byte and you did return an ETag here, clients tend to get
- * confused.
- *
- * If you don't return an ETag, you can just return null.
- *
- * @param mixed $addressBookId
- * @param string $cardUri
- * @param string $cardData
- * @return string|null
- */
- function updateCard($addressBookId, $cardUri, $cardData) {
-
- if (is_resource($cardData)) {
- $cardData = stream_get_contents($cardData);
- }
- $this->cards[$addressBookId][$cardUri] = $cardData;
- return '"' . md5($cardData) . '"';
-
- }
-
- function deleteCard($addressBookId, $cardUri) {
-
- unset($this->cards[$addressBookId][$cardUri]);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Backend/PDOMySQLTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Backend/PDOMySQLTest.php
deleted file mode 100644
index c1b0e274ebd..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Backend/PDOMySQLTest.php
+++ /dev/null
@@ -1,9 +0,0 @@
-backend = new Backend\Mock();
- $this->card = new Card(
- $this->backend,
- [
- 'uri' => 'book1',
- 'id' => 'foo',
- 'principaluri' => 'principals/user1',
- ],
- [
- 'uri' => 'card1',
- 'addressbookid' => 'foo',
- 'carddata' => 'card',
- ]
- );
-
- }
-
- function testGet() {
-
- $result = $this->card->get();
- $this->assertEquals('card', $result);
-
- }
- function testGet2() {
-
- $this->card = new Card(
- $this->backend,
- [
- 'uri' => 'book1',
- 'id' => 'foo',
- 'principaluri' => 'principals/user1',
- ],
- [
- 'uri' => 'card1',
- 'addressbookid' => 'foo',
- ]
- );
- $result = $this->card->get();
- $this->assertEquals("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD", $result);
-
- }
-
-
- /**
- * @depends testGet
- */
- function testPut() {
-
- $file = fopen('php://memory', 'r+');
- fwrite($file, 'newdata');
- rewind($file);
- $this->card->put($file);
- $result = $this->card->get();
- $this->assertEquals('newdata', $result);
-
- }
-
-
- function testDelete() {
-
- $this->card->delete();
- $this->assertEquals(1, count($this->backend->cards['foo']));
-
- }
-
- function testGetContentType() {
-
- $this->assertEquals('text/vcard; charset=utf-8', $this->card->getContentType());
-
- }
-
- function testGetETag() {
-
- $this->assertEquals('"' . md5('card') . '"', $this->card->getETag());
-
- }
-
- function testGetETag2() {
-
- $card = new Card(
- $this->backend,
- [
- 'uri' => 'book1',
- 'id' => 'foo',
- 'principaluri' => 'principals/user1',
- ],
- [
- 'uri' => 'card1',
- 'addressbookid' => 'foo',
- 'carddata' => 'card',
- 'etag' => '"blabla"',
- ]
- );
- $this->assertEquals('"blabla"', $card->getETag());
-
- }
-
- function testGetLastModified() {
-
- $this->assertEquals(null, $this->card->getLastModified());
-
- }
-
- function testGetSize() {
-
- $this->assertEquals(4, $this->card->getSize());
- $this->assertEquals(4, $this->card->getSize());
-
- }
-
- function testGetSize2() {
-
- $card = new Card(
- $this->backend,
- [
- 'uri' => 'book1',
- 'id' => 'foo',
- 'principaluri' => 'principals/user1',
- ],
- [
- 'uri' => 'card1',
- 'addressbookid' => 'foo',
- 'etag' => '"blabla"',
- 'size' => 4,
- ]
- );
- $this->assertEquals(4, $card->getSize());
-
- }
-
- function testACLMethods() {
-
- $this->assertEquals('principals/user1', $this->card->getOwner());
- $this->assertNull($this->card->getGroup());
- $this->assertEquals([
- [
- 'privilege' => '{DAV:}all',
- 'principal' => 'principals/user1',
- 'protected' => true,
- ],
- ], $this->card->getACL());
-
- }
- function testOverrideACL() {
-
- $card = new Card(
- $this->backend,
- [
- 'uri' => 'book1',
- 'id' => 'foo',
- 'principaluri' => 'principals/user1',
- ],
- [
- 'uri' => 'card1',
- 'addressbookid' => 'foo',
- 'carddata' => 'card',
- 'acl' => [
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user1',
- 'protected' => true,
- ],
- ],
- ]
- );
- $this->assertEquals([
- [
- 'privilege' => '{DAV:}read',
- 'principal' => 'principals/user1',
- 'protected' => true,
- ],
- ], $card->getACL());
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\Forbidden
- */
- function testSetACL() {
-
- $this->card->setACL([]);
-
- }
-
- function testGetSupportedPrivilegeSet() {
-
- $this->assertNull(
- $this->card->getSupportedPrivilegeSet()
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/IDirectoryTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/IDirectoryTest.php
deleted file mode 100644
index 4796a131f87..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/IDirectoryTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-addPlugin($plugin);
-
- $props = $server->getProperties('directory', ['{DAV:}resourcetype']);
- $this->assertTrue($props['{DAV:}resourcetype']->is('{' . Plugin::NS_CARDDAV . '}directory'));
-
- }
-
-}
-
-class DirectoryMock extends DAV\SimpleCollection implements IDirectory {
-
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/MultiGetTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/MultiGetTest.php
deleted file mode 100644
index 2d57c6ae759..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/MultiGetTest.php
+++ /dev/null
@@ -1,99 +0,0 @@
- 'REPORT',
- 'REQUEST_URI' => '/addressbooks/user1/book1',
- ]);
-
- $request->setBody(
-'
-
-
-
- /addressbooks/user1/book1/card1
- '
- );
-
- $response = new HTTP\ResponseMock();
-
- $this->server->httpRequest = $request;
- $this->server->httpResponse = $response;
-
- $this->server->exec();
-
- $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:' . $response->body);
-
- // using the client for parsing
- $client = new DAV\Client(['baseUri' => '/']);
-
- $result = $client->parseMultiStatus($response->body);
-
- $this->assertEquals([
- '/addressbooks/user1/book1/card1' => [
- 200 => [
- '{DAV:}getetag' => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD") . '"',
- '{urn:ietf:params:xml:ns:carddav}address-data' => "BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD",
- ]
- ]
- ], $result);
-
- }
-
- function testMultiGetVCard4() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'REPORT',
- 'REQUEST_URI' => '/addressbooks/user1/book1',
- ]);
-
- $request->setBody(
-'
-
-
-
- /addressbooks/user1/book1/card1
- '
- );
-
- $response = new HTTP\ResponseMock();
-
- $this->server->httpRequest = $request;
- $this->server->httpResponse = $response;
-
- $this->server->exec();
-
- $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:' . $response->body);
-
- // using the client for parsing
- $client = new DAV\Client(['baseUri' => '/']);
-
- $result = $client->parseMultiStatus($response->body);
-
- $prodId = "PRODID:-//Sabre//Sabre VObject " . \Sabre\VObject\Version::VERSION . "//EN";
-
- $this->assertEquals([
- '/addressbooks/user1/book1/card1' => [
- 200 => [
- '{DAV:}getetag' => '"' . md5("BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD") . '"',
- '{urn:ietf:params:xml:ns:carddav}address-data' => "BEGIN:VCARD\r\nVERSION:4.0\r\n$prodId\r\nUID:12345\r\nEND:VCARD\r\n",
- ]
- ]
- ], $result);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/PluginTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/PluginTest.php
deleted file mode 100644
index 6962e7830c5..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/PluginTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-assertEquals('{' . Plugin::NS_CARDDAV . '}addressbook', $this->server->resourceTypeMapping['Sabre\\CardDAV\\IAddressBook']);
-
- $this->assertTrue(in_array('addressbook', $this->plugin->getFeatures()));
- $this->assertEquals('carddav', $this->plugin->getPluginInfo()['name']);
-
- }
-
- function testSupportedReportSet() {
-
- $this->assertEquals([
- '{' . Plugin::NS_CARDDAV . '}addressbook-multiget',
- '{' . Plugin::NS_CARDDAV . '}addressbook-query',
- ], $this->plugin->getSupportedReportSet('addressbooks/user1/book1'));
-
- }
-
- function testSupportedReportSetEmpty() {
-
- $this->assertEquals([
- ], $this->plugin->getSupportedReportSet(''));
-
- }
-
- function testAddressBookHomeSet() {
-
- $result = $this->server->getProperties('principals/user1', ['{' . Plugin::NS_CARDDAV . '}addressbook-home-set']);
-
- $this->assertEquals(1, count($result));
- $this->assertTrue(isset($result['{' . Plugin::NS_CARDDAV . '}addressbook-home-set']));
- $this->assertEquals('addressbooks/user1/', $result['{' . Plugin::NS_CARDDAV . '}addressbook-home-set']->getHref());
-
- }
-
- function testDirectoryGateway() {
-
- $result = $this->server->getProperties('principals/user1', ['{' . Plugin::NS_CARDDAV . '}directory-gateway']);
-
- $this->assertEquals(1, count($result));
- $this->assertTrue(isset($result['{' . Plugin::NS_CARDDAV . '}directory-gateway']));
- $this->assertEquals(['directory'], $result['{' . Plugin::NS_CARDDAV . '}directory-gateway']->getHrefs());
-
- }
-
- function testReportPassThrough() {
-
- $this->assertNull($this->plugin->report('{DAV:}foo', new \DomDocument(), ''));
-
- }
-
- function testHTMLActionsPanel() {
-
- $output = '';
- $r = $this->server->emit('onHTMLActionsPanel', [$this->server->tree->getNodeForPath('addressbooks/user1'), &$output]);
- $this->assertFalse($r);
-
- $this->assertTrue(!!strpos($output, 'Display name'));
-
- }
-
- function testAddressbookPluginProperties() {
-
- $ns = '{' . Plugin::NS_CARDDAV . '}';
- $propFind = new DAV\PropFind('addressbooks/user1/book1', [
- $ns . 'supported-address-data',
- $ns . 'supported-collation-set',
- ]);
- $node = $this->server->tree->getNodeForPath('addressbooks/user1/book1');
- $this->plugin->propFindEarly($propFind, $node);
-
- $this->assertInstanceOf(
- 'Sabre\\CardDAV\\Xml\\Property\\SupportedAddressData',
- $propFind->get($ns . 'supported-address-data')
- );
- $this->assertInstanceOf(
- 'Sabre\\CardDAV\\Xml\\Property\\SupportedCollationSet',
- $propFind->get($ns . 'supported-collation-set')
- );
-
-
- }
-
- function testGetTransform() {
-
- $request = new \Sabre\HTTP\Request('GET', '/addressbooks/user1/book1/card1', ['Accept: application/vcard+json']);
- $response = new \Sabre\HTTP\ResponseMock();
- $this->server->invokeMethod($request, $response);
-
- $this->assertEquals(200, $response->getStatus());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php
deleted file mode 100644
index d4bc48098dc..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/SogoStripContentTypeTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
- 1,
- 'uri' => 'book1',
- 'principaluri' => 'principals/user1',
- ],
- ];
- protected $carddavCards = [
- 1 => [
- 'card1.vcf' => "BEGIN:VCARD\nVERSION:3.0\nUID:12345\nEND:VCARD",
- ],
- ];
-
- function testDontStrip() {
-
- $result = $this->server->getProperties('addressbooks/user1/book1/card1.vcf', ['{DAV:}getcontenttype']);
- $this->assertEquals([
- '{DAV:}getcontenttype' => 'text/vcard; charset=utf-8'
- ], $result);
-
- }
- function testStrip() {
-
- $this->server->httpRequest = HTTP\Sapi::createFromServerArray([
- 'HTTP_USER_AGENT' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2 Lightning/1.2.1',
- ]);
- $result = $this->server->getProperties('addressbooks/user1/book1/card1.vcf', ['{DAV:}getcontenttype']);
- $this->assertEquals([
- '{DAV:}getcontenttype' => 'text/x-vcard'
- ], $result);
-
- }
- function testDontTouchOtherMimeTypes() {
-
- $this->server->httpRequest = new HTTP\Request('GET', '/addressbooks/user1/book1/card1.vcf', [
- 'User-Agent' => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:10.0.2) Gecko/20120216 Thunderbird/10.0.2 Lightning/1.2.1',
- ]);
-
- $propFind = new PropFind('hello', ['{DAV:}getcontenttype']);
- $propFind->set('{DAV:}getcontenttype', 'text/plain');
- $this->carddavPlugin->propFindLate($propFind, new \Sabre\DAV\SimpleCollection('foo'));
- $this->assertEquals('text/plain', $propFind->get('{DAV:}getcontenttype'));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/TestUtil.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/TestUtil.php
deleted file mode 100644
index ec8a3501e81..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/TestUtil.php
+++ /dev/null
@@ -1,62 +0,0 @@
-createAddressBook(
- 'principals/user1',
- 'UUID-123467',
- [
- '{DAV:}displayname' => 'user1 addressbook',
- '{urn:ietf:params:xml:ns:carddav}addressbook-description' => 'AddressBook description',
- ]
- );
- $backend->createAddressBook(
- 'principals/user1',
- 'UUID-123468',
- [
- '{DAV:}displayname' => 'user1 addressbook2',
- '{urn:ietf:params:xml:ns:carddav}addressbook-description' => 'AddressBook description',
- ]
- );
- $backend->createCard($addressbookId, 'UUID-2345', self::getTestCardData());
- return $pdo;
-
- }
-
- static function deleteSQLiteDB() {
- $sqliteTest = new Backend\PDOSqliteTest();
- $pdo = $sqliteTest->tearDown();
- }
-
- static function getTestCardData() {
-
- $addressbookData = 'BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Acme Inc.//RoadRunner 1.0//EN
-FN:Wile E. Coyote
-N:Coyote;Wile;Erroll;;
-ORG:Acme Inc.
-UID:39A6B5ED-DD51-4AFE-A683-C35EE3749627
-REV:2012-06-20T07:00:39+00:00
-END:VCARD';
-
- return $addressbookData;
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/VCFExportTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/VCFExportTest.php
deleted file mode 100644
index 82d82faddc1..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/VCFExportTest.php
+++ /dev/null
@@ -1,135 +0,0 @@
- 'book1',
- 'uri' => 'book1',
- 'principaluri' => 'principals/user1',
- ]
- ];
- protected $carddavCards = [
- 'book1' => [
- "card1" => "BEGIN:VCARD\r\nFN:Person1\r\nEND:VCARD\r\n",
- "card2" => "BEGIN:VCARD\r\nFN:Person2\r\nEND:VCARD",
- "card3" => "BEGIN:VCARD\r\nFN:Person3\r\nEND:VCARD\r\n",
- "card4" => "BEGIN:VCARD\nFN:Person4\nEND:VCARD\n",
- ]
- ];
-
- function setUp() {
-
- parent::setUp();
- $plugin = new VCFExportPlugin();
- $this->server->addPlugin(
- $plugin
- );
-
- }
-
- function testSimple() {
-
- $plugin = $this->server->getPlugin('vcf-export');
- $this->assertInstanceOf('Sabre\\CardDAV\\VCFExportPlugin', $plugin);
-
- $this->assertEquals(
- 'vcf-export',
- $plugin->getPluginInfo()['name']
- );
-
- }
-
- function testExport() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_URI' => '/addressbooks/user1/book1?export',
- 'QUERY_STRING' => 'export',
- 'REQUEST_METHOD' => 'GET',
- ]);
-
- $response = $this->request($request);
- $this->assertEquals(200, $response->status, $response->body);
-
- $expected = "BEGIN:VCARD
-FN:Person1
-END:VCARD
-BEGIN:VCARD
-FN:Person2
-END:VCARD
-BEGIN:VCARD
-FN:Person3
-END:VCARD
-BEGIN:VCARD
-FN:Person4
-END:VCARD
-";
- // We actually expected windows line endings
- $expected = str_replace("\n", "\r\n", $expected);
-
- $this->assertEquals($expected, $response->body);
-
- }
-
- function testBrowserIntegration() {
-
- $plugin = $this->server->getPlugin('vcf-export');
- $actions = '';
- $addressbook = new AddressBook($this->carddavBackend, []);
- $this->server->emit('browserButtonActions', ['/foo', $addressbook, &$actions]);
- $this->assertContains('/foo?export', $actions);
-
- }
-
- function testContentDisposition() {
-
- $request = new HTTP\Request(
- 'GET',
- '/addressbooks/user1/book1?export'
- );
-
- $response = $this->request($request, 200);
- $this->assertEquals('text/directory', $response->getHeader('Content-Type'));
- $this->assertEquals(
- 'attachment; filename="book1-' . date('Y-m-d') . '.vcf"',
- $response->getHeader('Content-Disposition')
- );
-
- }
-
- function testContentDispositionBadChars() {
-
- $this->carddavBackend->createAddressBook(
- 'principals/user1',
- 'book-b_ad"(ch)ars',
- []
- );
- $this->carddavBackend->createCard(
- 'book-b_ad"(ch)ars',
- 'card1',
- "BEGIN:VCARD\r\nFN:Person1\r\nEND:VCARD\r\n"
- );
-
- $request = new HTTP\Request(
- 'GET',
- '/addressbooks/user1/book-b_ad"(ch)ars?export'
- );
-
- $response = $this->request($request, 200);
- $this->assertEquals('text/directory', $response->getHeader('Content-Type'));
- $this->assertEquals(
- 'attachment; filename="book-b_adchars-' . date('Y-m-d') . '.vcf"',
- $response->getHeader('Content-Disposition')
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/ValidateFilterTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/ValidateFilterTest.php
deleted file mode 100644
index 03c468f868f..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/ValidateFilterTest.php
+++ /dev/null
@@ -1,209 +0,0 @@
-assertTrue($this->plugin->validateFilters($input, $filters, $test), $message);
- } else {
- $this->assertFalse($this->plugin->validateFilters($input, $filters, $test), $message);
- }
-
- }
-
- function data() {
-
- $body1 = << 'title', 'is-not-defined' => false, 'param-filters' => [], 'text-matches' => []];
-
- // Check if FOO is defined
- $filter2 =
- ['name' => 'foo', 'is-not-defined' => false, 'param-filters' => [], 'text-matches' => []];
-
- // Check if TITLE is not defined
- $filter3 =
- ['name' => 'title', 'is-not-defined' => true, 'param-filters' => [], 'text-matches' => []];
-
- // Check if FOO is not defined
- $filter4 =
- ['name' => 'foo', 'is-not-defined' => true, 'param-filters' => [], 'text-matches' => []];
-
- // Check if TEL[TYPE] is defined
- $filter5 =
- [
- 'name' => 'tel',
- 'is-not-defined' => false,
- 'test' => 'anyof',
- 'param-filters' => [
- [
- 'name' => 'type',
- 'is-not-defined' => false,
- 'text-match' => null
- ],
- ],
- 'text-matches' => [],
- ];
-
- // Check if TEL[FOO] is defined
- $filter6 = $filter5;
- $filter6['param-filters'][0]['name'] = 'FOO';
-
- // Check if TEL[TYPE] is not defined
- $filter7 = $filter5;
- $filter7['param-filters'][0]['is-not-defined'] = true;
-
- // Check if TEL[FOO] is not defined
- $filter8 = $filter5;
- $filter8['param-filters'][0]['name'] = 'FOO';
- $filter8['param-filters'][0]['is-not-defined'] = true;
-
- // Combining property filters
- $filter9 = $filter5;
- $filter9['param-filters'][] = $filter6['param-filters'][0];
-
- $filter10 = $filter5;
- $filter10['param-filters'][] = $filter6['param-filters'][0];
- $filter10['test'] = 'allof';
-
- // Check if URL contains 'google'
- $filter11 =
- [
- 'name' => 'url',
- 'is-not-defined' => false,
- 'test' => 'anyof',
- 'param-filters' => [],
- 'text-matches' => [
- [
- 'match-type' => 'contains',
- 'value' => 'google',
- 'negate-condition' => false,
- 'collation' => 'i;octet',
- ],
- ],
- ];
-
- // Check if URL contains 'bing'
- $filter12 = $filter11;
- $filter12['text-matches'][0]['value'] = 'bing';
-
- // Check if URL does not contain 'google'
- $filter13 = $filter11;
- $filter13['text-matches'][0]['negate-condition'] = true;
-
- // Check if URL does not contain 'bing'
- $filter14 = $filter11;
- $filter14['text-matches'][0]['value'] = 'bing';
- $filter14['text-matches'][0]['negate-condition'] = true;
-
- // Param filter with text
- $filter15 = $filter5;
- $filter15['param-filters'][0]['text-match'] = [
- 'match-type' => 'contains',
- 'value' => 'WORK',
- 'collation' => 'i;octet',
- 'negate-condition' => false,
- ];
- $filter16 = $filter15;
- $filter16['param-filters'][0]['text-match']['negate-condition'] = true;
-
-
- // Param filter + text filter
- $filter17 = $filter5;
- $filter17['test'] = 'anyof';
- $filter17['text-matches'][] = [
- 'match-type' => 'contains',
- 'value' => '444',
- 'collation' => 'i;octet',
- 'negate-condition' => false,
- ];
-
- $filter18 = $filter17;
- $filter18['text-matches'][0]['negate-condition'] = true;
-
- $filter18['test'] = 'allof';
-
- return [
-
- // Basic filters
- [$body1, [$filter1], 'anyof',true],
- [$body1, [$filter2], 'anyof',false],
- [$body1, [$filter3], 'anyof',false],
- [$body1, [$filter4], 'anyof',true],
-
- // Combinations
- [$body1, [$filter1, $filter2], 'anyof',true],
- [$body1, [$filter1, $filter2], 'allof',false],
- [$body1, [$filter1, $filter4], 'anyof',true],
- [$body1, [$filter1, $filter4], 'allof',true],
- [$body1, [$filter2, $filter3], 'anyof',false],
- [$body1, [$filter2, $filter3], 'allof',false],
-
- // Basic parameters
- [$body1, [$filter5], 'anyof', true, 'TEL;TYPE is defined, so this should return true'],
- [$body1, [$filter6], 'anyof', false, 'TEL;FOO is not defined, so this should return false'],
-
- [$body1, [$filter7], 'anyof', false, 'TEL;TYPE is defined, so this should return false'],
- [$body1, [$filter8], 'anyof', true, 'TEL;TYPE is not defined, so this should return true'],
-
- // Combined parameters
- [$body1, [$filter9], 'anyof', true],
- [$body1, [$filter10], 'anyof', false],
-
- // Text-filters
- [$body1, [$filter11], 'anyof', true],
- [$body1, [$filter12], 'anyof', false],
- [$body1, [$filter13], 'anyof', false],
- [$body1, [$filter14], 'anyof', true],
-
- // Param filter with text-match
- [$body1, [$filter15], 'anyof', true],
- [$body1, [$filter16], 'anyof', false],
-
- // Param filter + text filter
- [$body1, [$filter17], 'anyof', true],
- [$body1, [$filter18], 'anyof', false],
- [$body1, [$filter18], 'anyof', false],
- ];
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/ValidateVCardTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/ValidateVCardTest.php
deleted file mode 100644
index acba2cfc8f3..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/ValidateVCardTest.php
+++ /dev/null
@@ -1,305 +0,0 @@
- 'addressbook1',
- 'principaluri' => 'principals/admin',
- 'uri' => 'addressbook1',
- ]
- ];
-
- $this->cardBackend = new Backend\Mock($addressbooks, []);
- $principalBackend = new DAVACL\PrincipalBackend\Mock();
-
- $tree = [
- new AddressBookRoot($principalBackend, $this->cardBackend),
- ];
-
- $this->server = new DAV\Server($tree);
- $this->server->sapi = new HTTP\SapiMock();
- $this->server->debugExceptions = true;
-
- $plugin = new Plugin();
- $this->server->addPlugin($plugin);
-
- $response = new HTTP\ResponseMock();
- $this->server->httpResponse = $response;
-
- }
-
- function request(HTTP\Request $request, $expectedStatus = null) {
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- if ($expectedStatus) {
-
- $realStatus = $this->server->httpResponse->getStatus();
-
- $msg = '';
- if ($realStatus !== $expectedStatus) {
- $msg = 'Response body: ' . $this->server->httpResponse->getBodyAsString();
- }
- $this->assertEquals(
- $expectedStatus,
- $realStatus,
- $msg
- );
- }
-
- return $this->server->httpResponse;
-
- }
-
- function testCreateFile() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'PUT',
- 'REQUEST_URI' => '/addressbooks/admin/addressbook1/blabla.vcf',
- ]);
-
- $response = $this->request($request);
-
- $this->assertEquals(415, $response->status);
-
- }
-
- function testCreateFileValid() {
-
- $request = new HTTP\Request(
- 'PUT',
- '/addressbooks/admin/addressbook1/blabla.vcf'
- );
-
- $vcard = <<setBody($vcard);
-
- $response = $this->request($request, 201);
-
- // The custom Ew header should not be set
- $this->assertNull(
- $response->getHeader('X-Sabre-Ew-Gross')
- );
- // Valid, non-auto-fixed responses should contain an ETag.
- $this->assertTrue(
- $response->getHeader('ETag') !== null,
- 'We did not receive an etag'
- );
-
-
- $expected = [
- 'uri' => 'blabla.vcf',
- 'carddata' => $vcard,
- 'size' => strlen($vcard),
- 'etag' => '"' . md5($vcard) . '"',
- ];
-
- $this->assertEquals($expected, $this->cardBackend->getCard('addressbook1', 'blabla.vcf'));
-
- }
-
- /**
- * This test creates an intentionally broken vCard that vobject is able
- * to automatically repair.
- *
- * @depends testCreateFileValid
- */
- function testCreateVCardAutoFix() {
-
- $request = new HTTP\Request(
- 'PUT',
- '/addressbooks/admin/addressbook1/blabla.vcf'
- );
-
- // The error in this vcard is that there's not enough semi-colons in N
- $vcard = <<setBody($vcard);
-
- $response = $this->request($request, 201);
-
- // Auto-fixed vcards should NOT return an etag
- $this->assertNull(
- $response->getHeader('ETag')
- );
-
- // We should have gotten an Ew header
- $this->assertNotNull(
- $response->getHeader('X-Sabre-Ew-Gross')
- );
-
- $expectedVCard = << 'blabla.vcf',
- 'carddata' => $expectedVCard,
- 'size' => strlen($expectedVCard),
- 'etag' => '"' . md5($expectedVCard) . '"',
- ];
-
- $this->assertEquals($expected, $this->cardBackend->getCard('addressbook1', 'blabla.vcf'));
-
- }
-
- /**
- * This test creates an intentionally broken vCard that vobject is able
- * to automatically repair.
- *
- * However, we're supplying a heading asking the server to treat the
- * request as strict, so the server should still let the request fail.
- *
- * @depends testCreateFileValid
- */
- function testCreateVCardStrictFail() {
-
- $request = new HTTP\Request(
- 'PUT',
- '/addressbooks/admin/addressbook1/blabla.vcf',
- [
- 'Prefer' => 'handling=strict',
- ]
- );
-
- // The error in this vcard is that there's not enough semi-colons in N
- $vcard = <<setBody($vcard);
- $this->request($request, 415);
-
- }
-
- function testCreateFileNoUID() {
-
- $request = new HTTP\Request(
- 'PUT',
- '/addressbooks/admin/addressbook1/blabla.vcf'
- );
- $vcard = <<setBody($vcard);
-
- $response = $this->request($request, 201);
-
- $foo = $this->cardBackend->getCard('addressbook1', 'blabla.vcf');
- $this->assertTrue(
- strpos($foo['carddata'], 'UID') !== false,
- print_r($foo, true)
- );
- }
-
- function testCreateFileJson() {
-
- $request = new HTTP\Request(
- 'PUT',
- '/addressbooks/admin/addressbook1/blabla.vcf'
- );
- $request->setBody('[ "vcard" , [ [ "VERSION", {}, "text", "4.0"], [ "UID" , {}, "text", "foo" ], [ "FN", {}, "text", "FirstName LastName"] ] ]');
-
- $response = $this->request($request);
-
- $this->assertEquals(201, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
-
- $foo = $this->cardBackend->getCard('addressbook1', 'blabla.vcf');
- $this->assertEquals("BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nFN:FirstName LastName\r\nEND:VCARD\r\n", $foo['carddata']);
-
- }
-
- function testCreateFileVCalendar() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'PUT',
- 'REQUEST_URI' => '/addressbooks/admin/addressbook1/blabla.vcf',
- ]);
- $request->setBody("BEGIN:VCALENDAR\r\nEND:VCALENDAR\r\n");
-
- $response = $this->request($request);
-
- $this->assertEquals(415, $response->status, 'Incorrect status returned! Full response body: ' . $response->body);
-
- }
-
- function testUpdateFile() {
-
- $this->cardBackend->createCard('addressbook1', 'blabla.vcf', 'foo');
- $request = new HTTP\Request(
- 'PUT',
- '/addressbooks/admin/addressbook1/blabla.vcf'
- );
-
- $response = $this->request($request, 415);
-
- }
-
- function testUpdateFileParsableBody() {
-
- $this->cardBackend->createCard('addressbook1', 'blabla.vcf', 'foo');
- $request = new HTTP\Request(
- 'PUT',
- '/addressbooks/admin/addressbook1/blabla.vcf'
- );
-
- $body = "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nFN:FirstName LastName\r\nEND:VCARD\r\n";
- $request->setBody($body);
-
- $response = $this->request($request, 204);
-
- $expected = [
- 'uri' => 'blabla.vcf',
- 'carddata' => $body,
- 'size' => strlen($body),
- 'etag' => '"' . md5($body) . '"',
- ];
-
- $this->assertEquals($expected, $this->cardBackend->getCard('addressbook1', 'blabla.vcf'));
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Xml/Property/SupportedAddressDataTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Xml/Property/SupportedAddressDataTest.php
deleted file mode 100644
index 43abebdcec1..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Xml/Property/SupportedAddressDataTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-assertInstanceOf('Sabre\CardDAV\Xml\Property\SupportedAddressData', $property);
-
- }
-
- /**
- * @depends testSimple
- */
- function testSerialize() {
-
- $property = new SupportedAddressData();
-
- $this->namespaceMap[CardDAV\Plugin::NS_CARDDAV] = 'card';
- $xml = $this->write(['{DAV:}root' => $property]);
-
- $this->assertXmlStringEqualsXmlString(
-'
-' .
-'
-', $xml);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Xml/Property/SupportedCollationSetTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Xml/Property/SupportedCollationSetTest.php
deleted file mode 100644
index e06aff101d9..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Xml/Property/SupportedCollationSetTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-assertInstanceOf('Sabre\CardDAV\Xml\Property\SupportedCollationSet', $property);
-
- }
-
- /**
- * @depends testSimple
- */
- function testSerialize() {
-
- $property = new SupportedCollationSet();
-
- $this->namespaceMap[CardDAV\Plugin::NS_CARDDAV] = 'card';
- $xml = $this->write(['{DAV:}root' => $property]);
-
- $this->assertXmlStringEqualsXmlString(
-'
-' .
-'i;ascii-casemap ' .
-'i;octet ' .
-'i;unicode-casemap ' .
-'
-', $xml);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Xml/Request/AddressBookMultiGetTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Xml/Request/AddressBookMultiGetTest.php
deleted file mode 100644
index ea2ab75ceec..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Xml/Request/AddressBookMultiGetTest.php
+++ /dev/null
@@ -1,47 +0,0 @@
- 'Sabre\\CardDAV\\Xml\\Request\AddressBookMultiGetReport',
- ];
-
- function testDeserialize() {
-
- /* lines look a bit odd but this triggers an XML parsing bug */
- $xml = <<
-
-
- /foo.vcf
-
-XML;
-
- $result = $this->parse($xml);
- $addressBookMultiGetReport = new AddressBookMultiGetReport();
- $addressBookMultiGetReport->properties = [
- '{DAV:}getcontenttype',
- '{DAV:}getetag',
- '{urn:ietf:params:xml:ns:carddav}address-data',
- ];
- $addressBookMultiGetReport->hrefs = ['/foo.vcf'];
- $addressBookMultiGetReport->contentType = 'text/vcard';
- $addressBookMultiGetReport->version = '4.0';
- $addressBookMultiGetReport->addressDataProperties = [];
-
-
- $this->assertEquals(
- $addressBookMultiGetReport,
- $result['value']
- );
-
- }
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Xml/Request/AddressBookQueryReportTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Xml/Request/AddressBookQueryReportTest.php
deleted file mode 100644
index 3a2e4b46a0e..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/CardDAV/Xml/Request/AddressBookQueryReportTest.php
+++ /dev/null
@@ -1,350 +0,0 @@
- 'Sabre\\CardDAV\\Xml\\Request\AddressBookQueryReport',
- ];
-
- function testDeserialize() {
-
- $xml = <<
-
-
-
-
-
-
-XML;
-
- $result = $this->parse($xml);
- $addressBookQueryReport = new AddressBookQueryReport();
- $addressBookQueryReport->properties = [
- '{DAV:}getetag',
- ];
- $addressBookQueryReport->test = 'anyof';
- $addressBookQueryReport->filters = [
- [
- 'name' => 'uid',
- 'test' => 'anyof',
- 'is-not-defined' => false,
- 'param-filters' => [],
- 'text-matches' => [],
- ]
- ];
-
- $this->assertEquals(
- $addressBookQueryReport,
- $result['value']
- );
-
- }
-
- function testDeserializeAllOf() {
-
- $xml = <<
-
-
-
-
-
-
-XML;
-
- $result = $this->parse($xml);
- $addressBookQueryReport = new AddressBookQueryReport();
- $addressBookQueryReport->properties = [
- '{DAV:}getetag',
- ];
- $addressBookQueryReport->test = 'allof';
- $addressBookQueryReport->filters = [
- [
- 'name' => 'uid',
- 'test' => 'anyof',
- 'is-not-defined' => false,
- 'param-filters' => [],
- 'text-matches' => [],
- ]
- ];
-
- $this->assertEquals(
- $addressBookQueryReport,
- $result['value']
- );
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\BadRequest
- */
- function testDeserializeBadTest() {
-
- $xml = <<
-
-
-
-
-
-
-XML;
-
- $this->parse($xml);
-
- }
-
- /**
- * We should error on this, but KDE does this, so we chose to support it.
- */
- function testDeserializeNoFilter() {
-
- $xml = <<
-
-
-
-
-XML;
-
- $result = $this->parse($xml);
- $addressBookQueryReport = new AddressBookQueryReport();
- $addressBookQueryReport->properties = [
- '{DAV:}getetag',
- ];
- $addressBookQueryReport->test = 'anyof';
- $addressBookQueryReport->filters = [];
-
- $this->assertEquals(
- $addressBookQueryReport,
- $result['value']
- );
-
- }
-
- function testDeserializeComplex() {
-
- $xml = <<
-
-
-
-
-
-
-
-
-
-
- Hello!
-
-
-
- No
-
-
- 10
-XML;
-
- $result = $this->parse($xml);
- $addressBookQueryReport = new AddressBookQueryReport();
- $addressBookQueryReport->properties = [
- '{DAV:}getetag',
- '{urn:ietf:params:xml:ns:carddav}address-data',
- ];
- $addressBookQueryReport->test = 'anyof';
- $addressBookQueryReport->filters = [
- [
- 'name' => 'uid',
- 'test' => 'anyof',
- 'is-not-defined' => true,
- 'param-filters' => [],
- 'text-matches' => [],
- ],
- [
- 'name' => 'x-foo',
- 'test' => 'allof',
- 'is-not-defined' => false,
- 'param-filters' => [
- [
- 'name' => 'x-param1',
- 'is-not-defined' => false,
- 'text-match' => null,
- ],
- [
- 'name' => 'x-param2',
- 'is-not-defined' => true,
- 'text-match' => null,
- ],
- [
- 'name' => 'x-param3',
- 'is-not-defined' => false,
- 'text-match' => [
- 'negate-condition' => false,
- 'value' => 'Hello!',
- 'match-type' => 'contains',
- 'collation' => 'i;unicode-casemap',
- ],
- ],
- ],
- 'text-matches' => [],
- ],
- [
- 'name' => 'x-prop2',
- 'test' => 'anyof',
- 'is-not-defined' => false,
- 'param-filters' => [],
- 'text-matches' => [
- [
- 'negate-condition' => true,
- 'value' => 'No',
- 'match-type' => 'starts-with',
- 'collation' => 'i;unicode-casemap',
- ],
- ],
- ]
- ];
-
- $addressBookQueryReport->version = '4.0';
- $addressBookQueryReport->contentType = 'application/vcard+json';
- $addressBookQueryReport->limit = 10;
-
- $this->assertEquals(
- $addressBookQueryReport,
- $result['value']
- );
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\BadRequest
- */
- function testDeserializeBadMatchType() {
-
- $xml = <<
-
-
-
-
-
-
- Hello!
-
-
-
-
-XML;
- $this->parse($xml);
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\BadRequest
- */
- function testDeserializeBadMatchType2() {
-
- $xml = <<
-
-
-
-
-
- No
-
-
-
-XML;
- $this->parse($xml);
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\BadRequest
- */
- function testDeserializeDoubleFilter() {
-
- $xml = <<
-
-
-
-
-
-
-
-
-XML;
- $this->parse($xml);
-
- }
-
- function testDeserializeAddressbookElements() {
-
- $xml = <<
-
-
-
-
-
-
-XML;
-
- $result = $this->parse($xml);
- $addressBookQueryReport = new AddressBookQueryReport();
- $addressBookQueryReport->properties = [
- '{DAV:}getetag',
- '{urn:ietf:params:xml:ns:carddav}address-data'
- ];
- $addressBookQueryReport->filters = [];
- $addressBookQueryReport->test = 'anyof';
- $addressBookQueryReport->contentType = 'text/vcard';
- $addressBookQueryReport->version = '3.0';
- $addressBookQueryReport->addressDataProperties = [
- 'VERSION',
- 'UID',
- 'NICKNAME',
- 'EMAIL',
- 'FN',
- 'TEL',
- ];
-
- $this->assertEquals(
- $addressBookQueryReport,
- $result['value']
- );
-
- }
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/AbstractServer.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/AbstractServer.php
deleted file mode 100644
index 6a8d389a008..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/AbstractServer.php
+++ /dev/null
@@ -1,64 +0,0 @@
-response = new HTTP\ResponseMock();
- $this->server = new Server($this->getRootNode());
- $this->server->sapi = new HTTP\SapiMock();
- $this->server->httpResponse = $this->response;
- $this->server->debugExceptions = true;
- $this->deleteTree(SABRE_TEMPDIR, false);
- file_put_contents(SABRE_TEMPDIR . '/test.txt', 'Test contents');
- mkdir(SABRE_TEMPDIR . '/dir');
- file_put_contents(SABRE_TEMPDIR . '/dir/child.txt', 'Child contents');
-
-
- }
-
- function tearDown() {
-
- $this->deleteTree(SABRE_TEMPDIR, false);
-
- }
-
- protected function getRootNode() {
-
- return new FS\Directory(SABRE_TEMPDIR);
-
- }
-
- private function deleteTree($path, $deleteRoot = true) {
-
- foreach (scandir($path) as $node) {
-
- if ($node == '.' || $node == '.svn' || $node == '..') continue;
- $myPath = $path . '/' . $node;
- if (is_file($myPath)) {
- unlink($myPath);
- } else {
- $this->deleteTree($myPath);
- }
-
- }
- if ($deleteRoot) rmdir($path);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
deleted file mode 100644
index 455403affe7..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-assertFalse(
- $backend->check($request, $response)[0]
- );
-
- }
-
- function testCheckUnknownUser() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'PHP_AUTH_USER' => 'username',
- 'PHP_AUTH_PW' => 'wrongpassword',
- ]);
- $response = new HTTP\Response();
-
- $backend = new AbstractBasicMock();
-
- $this->assertFalse(
- $backend->check($request, $response)[0]
- );
-
- }
-
- function testCheckSuccess() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'PHP_AUTH_USER' => 'username',
- 'PHP_AUTH_PW' => 'password',
- ]);
- $response = new HTTP\Response();
-
- $backend = new AbstractBasicMock();
- $this->assertEquals(
- [true, 'principals/username'],
- $backend->check($request, $response)
- );
-
- }
-
- function testRequireAuth() {
-
- $request = new HTTP\Request();
- $response = new HTTP\Response();
-
- $backend = new AbstractBasicMock();
- $backend->setRealm('writing unittests on a saturday night');
- $backend->challenge($request, $response);
-
- $this->assertEquals(
- 'Basic realm="writing unittests on a saturday night"',
- $response->getHeader('WWW-Authenticate')
- );
-
- }
-
-}
-
-
-class AbstractBasicMock extends AbstractBasic {
-
- /**
- * Validates a username and password
- *
- * This method should return true or false depending on if login
- * succeeded.
- *
- * @param string $username
- * @param string $password
- * @return bool
- */
- function validateUserPass($username, $password) {
-
- return ($username == 'username' && $password == 'password');
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBearerTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBearerTest.php
deleted file mode 100644
index c3857883007..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBearerTest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-assertFalse(
- $backend->check($request, $response)[0]
- );
-
- }
-
- function testCheckInvalidToken() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'HTTP_AUTHORIZATION' => 'Bearer foo',
- ]);
- $response = new HTTP\Response();
-
- $backend = new AbstractBearerMock();
-
- $this->assertFalse(
- $backend->check($request, $response)[0]
- );
-
- }
-
- function testCheckSuccess() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'HTTP_AUTHORIZATION' => 'Bearer valid',
- ]);
- $response = new HTTP\Response();
-
- $backend = new AbstractBearerMock();
- $this->assertEquals(
- [true, 'principals/username'],
- $backend->check($request, $response)
- );
-
- }
-
- function testRequireAuth() {
-
- $request = new HTTP\Request();
- $response = new HTTP\Response();
-
- $backend = new AbstractBearerMock();
- $backend->setRealm('writing unittests on a saturday night');
- $backend->challenge($request, $response);
-
- $this->assertEquals(
- 'Bearer realm="writing unittests on a saturday night"',
- $response->getHeader('WWW-Authenticate')
- );
-
- }
-
-}
-
-
-class AbstractBearerMock extends AbstractBearer {
-
- /**
- * Validates a bearer token
- *
- * This method should return true or false depending on if login
- * succeeded.
- *
- * @param string $bearerToken
- * @return bool
- */
- function validateBearerToken($bearerToken) {
-
- return 'valid' === $bearerToken ? 'principals/username' : false;
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php
deleted file mode 100644
index 14c72aaa0f6..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php
+++ /dev/null
@@ -1,138 +0,0 @@
-assertFalse(
- $backend->check($request, $response)[0]
- );
-
- }
-
- function testCheckBadGetUserInfoResponse() {
-
- $header = 'username=null, realm=myRealm, nonce=12345, uri=/, response=HASH, opaque=1, qop=auth, nc=1, cnonce=1';
- $request = HTTP\Sapi::createFromServerArray([
- 'PHP_AUTH_DIGEST' => $header,
- ]);
- $response = new HTTP\Response();
-
- $backend = new AbstractDigestMock();
- $this->assertFalse(
- $backend->check($request, $response)[0]
- );
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception
- */
- function testCheckBadGetUserInfoResponse2() {
-
- $header = 'username=array, realm=myRealm, nonce=12345, uri=/, response=HASH, opaque=1, qop=auth, nc=1, cnonce=1';
- $request = HTTP\Sapi::createFromServerArray([
- 'PHP_AUTH_DIGEST' => $header,
- ]);
-
- $response = new HTTP\Response();
-
- $backend = new AbstractDigestMock();
- $backend->check($request, $response);
-
- }
-
- function testCheckUnknownUser() {
-
- $header = 'username=false, realm=myRealm, nonce=12345, uri=/, response=HASH, opaque=1, qop=auth, nc=1, cnonce=1';
- $request = HTTP\Sapi::createFromServerArray([
- 'PHP_AUTH_DIGEST' => $header,
- ]);
-
- $response = new HTTP\Response();
-
- $backend = new AbstractDigestMock();
- $this->assertFalse(
- $backend->check($request, $response)[0]
- );
-
- }
-
- function testCheckBadPassword() {
-
- $header = 'username=user, realm=myRealm, nonce=12345, uri=/, response=HASH, opaque=1, qop=auth, nc=1, cnonce=1';
- $request = HTTP\Sapi::createFromServerArray([
- 'PHP_AUTH_DIGEST' => $header,
- 'REQUEST_METHOD' => 'PUT',
- ]);
-
- $response = new HTTP\Response();
-
- $backend = new AbstractDigestMock();
- $this->assertFalse(
- $backend->check($request, $response)[0]
- );
-
- }
-
- function testCheck() {
-
- $digestHash = md5('HELLO:12345:1:1:auth:' . md5('GET:/'));
- $header = 'username=user, realm=myRealm, nonce=12345, uri=/, response=' . $digestHash . ', opaque=1, qop=auth, nc=1, cnonce=1';
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'GET',
- 'PHP_AUTH_DIGEST' => $header,
- 'REQUEST_URI' => '/',
- ]);
-
- $response = new HTTP\Response();
-
- $backend = new AbstractDigestMock();
- $this->assertEquals(
- [true, 'principals/user'],
- $backend->check($request, $response)
- );
-
- }
-
- function testRequireAuth() {
-
- $request = new HTTP\Request();
- $response = new HTTP\Response();
-
- $backend = new AbstractDigestMock();
- $backend->setRealm('writing unittests on a saturday night');
- $backend->challenge($request, $response);
-
- $this->assertStringStartsWith(
- 'Digest realm="writing unittests on a saturday night"',
- $response->getHeader('WWW-Authenticate')
- );
-
- }
-
-}
-
-
-class AbstractDigestMock extends AbstractDigest {
-
- function getDigestHash($realm, $userName) {
-
- switch ($userName) {
- case 'null' : return null;
- case 'false' : return false;
- case 'array' : return [];
- case 'user' : return 'HELLO';
- }
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php
deleted file mode 100644
index b14e9fa2ea3..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-dropTables('users');
- $this->createSchema('users');
-
- $this->getPDO()->query(
- "INSERT INTO users (username,digesta1) VALUES ('user','hash')"
-
- );
-
- }
-
- function testConstruct() {
-
- $pdo = $this->getPDO();
- $backend = new PDO($pdo);
- $this->assertTrue($backend instanceof PDO);
-
- }
-
- /**
- * @depends testConstruct
- */
- function testUserInfo() {
-
- $pdo = $this->getPDO();
- $backend = new PDO($pdo);
-
- $this->assertNull($backend->getDigestHash('realm', 'blabla'));
-
- $expected = 'hash';
-
- $this->assertEquals($expected, $backend->getDigestHash('realm', 'user'));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/ApacheTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/ApacheTest.php
deleted file mode 100644
index 29cbc216282..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/ApacheTest.php
+++ /dev/null
@@ -1,71 +0,0 @@
-assertInstanceOf('Sabre\DAV\Auth\Backend\Apache', $backend);
-
- }
-
- function testNoHeader() {
-
- $request = new HTTP\Request();
- $response = new HTTP\Response();
- $backend = new Apache();
-
- $this->assertFalse(
- $backend->check($request, $response)[0]
- );
-
- }
-
- function testRemoteUser() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REMOTE_USER' => 'username',
- ]);
- $response = new HTTP\Response();
- $backend = new Apache();
-
- $this->assertEquals(
- [true, 'principals/username'],
- $backend->check($request, $response)
- );
-
- }
-
- function testRedirectRemoteUser() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REDIRECT_REMOTE_USER' => 'username',
- ]);
- $response = new HTTP\Response();
- $backend = new Apache();
-
- $this->assertEquals(
- [true, 'principals/username'],
- $backend->check($request, $response)
- );
-
- }
-
- function testRequireAuth() {
-
- $request = new HTTP\Request();
- $response = new HTTP\Response();
-
- $backend = new Apache();
- $backend->challenge($request, $response);
-
- $this->assertNull(
- $response->getHeader('WWW-Authenticate')
- );
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/BasicCallBackTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/BasicCallBackTest.php
deleted file mode 100644
index 167f31eab37..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/BasicCallBackTest.php
+++ /dev/null
@@ -1,36 +0,0 @@
- 'Basic ' . base64_encode('foo:bar'),
- ]);
- $response = new Response();
-
- $this->assertEquals(
- [true, 'principals/foo'],
- $backend->check($request, $response)
- );
-
- $this->assertEquals(['foo', 'bar'], $args);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/FileTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/FileTest.php
deleted file mode 100644
index f694f4806ee..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/FileTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-assertTrue($file instanceof File);
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception
- */
- function testLoadFileBroken() {
-
- file_put_contents(SABRE_TEMPDIR . '/backend', 'user:realm:hash');
- $file = new File(SABRE_TEMPDIR . '/backend');
-
- }
-
- function testLoadFile() {
-
- file_put_contents(SABRE_TEMPDIR . '/backend', 'user:realm:' . md5('user:realm:password'));
- $file = new File();
- $file->loadFile(SABRE_TEMPDIR . '/backend');
-
- $this->assertFalse($file->getDigestHash('realm', 'blabla'));
- $this->assertEquals(md5('user:realm:password'), $file->getDigestHash('realm', 'user'));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/Mock.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/Mock.php
deleted file mode 100644
index 369bc249e47..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/Mock.php
+++ /dev/null
@@ -1,87 +0,0 @@
-principal = $principal;
-
- }
-
- /**
- * When this method is called, the backend must check if authentication was
- * successful.
- *
- * The returned value must be one of the following
- *
- * [true, "principals/username"]
- * [false, "reason for failure"]
- *
- * If authentication was successful, it's expected that the authentication
- * backend returns a so-called principal url.
- *
- * Examples of a principal url:
- *
- * principals/admin
- * principals/user1
- * principals/users/joe
- * principals/uid/123457
- *
- * If you don't use WebDAV ACL (RFC3744) we recommend that you simply
- * return a string such as:
- *
- * principals/users/[username]
- *
- * @param RequestInterface $request
- * @param ResponseInterface $response
- * @return array
- */
- function check(RequestInterface $request, ResponseInterface $response) {
-
- if ($this->invalidCheckResponse) {
- return 'incorrect!';
- }
- if ($this->fail) {
- return [false, "fail!"];
- }
- return [true, $this->principal];
-
- }
-
- /**
- * This method is called when a user could not be authenticated, and
- * authentication was required for the current request.
- *
- * This gives you the oppurtunity to set authentication headers. The 401
- * status code will already be set.
- *
- * In this case of Basic Auth, this would for example mean that the
- * following header needs to be set:
- *
- * $response->addHeader('WWW-Authenticate', 'Basic realm=SabreDAV');
- *
- * Keep in mind that in the case of multiple authentication backends, other
- * WWW-Authenticate headers may already have been set, and you'll want to
- * append your own WWW-Authenticate header instead of overwriting the
- * existing one.
- *
- * @param RequestInterface $request
- * @param ResponseInterface $response
- * @return void
- */
- function challenge(RequestInterface $request, ResponseInterface $response) {
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/PDOMySQLTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/PDOMySQLTest.php
deleted file mode 100644
index 18f59793ad7..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Auth/Backend/PDOMySQLTest.php
+++ /dev/null
@@ -1,9 +0,0 @@
-assertTrue($plugin instanceof Plugin);
- $fakeServer->addPlugin($plugin);
- $this->assertEquals($plugin, $fakeServer->getPlugin('auth'));
- $this->assertInternalType('array', $plugin->getPluginInfo());
-
- }
-
- /**
- * @depends testInit
- */
- function testAuthenticate() {
-
- $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
- $plugin = new Plugin(new Backend\Mock());
- $fakeServer->addPlugin($plugin);
- $this->assertTrue(
- $fakeServer->emit('beforeMethod', [new HTTP\Request(), new HTTP\Response()])
- );
-
- }
-
- /**
- * @depends testInit
- * @expectedException Sabre\DAV\Exception\NotAuthenticated
- */
- function testAuthenticateFail() {
-
- $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
- $backend = new Backend\Mock();
- $backend->fail = true;
-
- $plugin = new Plugin($backend);
- $fakeServer->addPlugin($plugin);
- $fakeServer->emit('beforeMethod', [new HTTP\Request(), new HTTP\Response()]);
-
- }
-
- /**
- * @depends testAuthenticateFail
- */
- function testAuthenticateFailDontAutoRequire() {
-
- $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
- $backend = new Backend\Mock();
- $backend->fail = true;
-
- $plugin = new Plugin($backend);
- $plugin->autoRequireLogin = false;
- $fakeServer->addPlugin($plugin);
- $this->assertTrue(
- $fakeServer->emit('beforeMethod', [new HTTP\Request(), new HTTP\Response()])
- );
- $this->assertEquals(1, count($plugin->getLoginFailedReasons()));
-
- }
-
- /**
- * @depends testAuthenticate
- */
- function testMultipleBackend() {
-
- $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
- $backend1 = new Backend\Mock();
- $backend2 = new Backend\Mock();
- $backend2->fail = true;
-
- $plugin = new Plugin();
- $plugin->addBackend($backend1);
- $plugin->addBackend($backend2);
-
- $fakeServer->addPlugin($plugin);
- $fakeServer->emit('beforeMethod', [new HTTP\Request(), new HTTP\Response()]);
-
- $this->assertEquals('principals/admin', $plugin->getCurrentPrincipal());
-
- }
-
- /**
- * @depends testInit
- * @expectedException Sabre\DAV\Exception
- */
- function testNoAuthBackend() {
-
- $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
-
- $plugin = new Plugin();
- $fakeServer->addPlugin($plugin);
- $fakeServer->emit('beforeMethod', [new HTTP\Request(), new HTTP\Response()]);
-
- }
- /**
- * @depends testInit
- * @expectedException Sabre\DAV\Exception
- */
- function testInvalidCheckResponse() {
-
- $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
- $backend = new Backend\Mock();
- $backend->invalidCheckResponse = true;
-
- $plugin = new Plugin($backend);
- $fakeServer->addPlugin($plugin);
- $fakeServer->emit('beforeMethod', [new HTTP\Request(), new HTTP\Response()]);
-
- }
-
- /**
- * @depends testAuthenticate
- */
- function testGetCurrentPrincipal() {
-
- $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
- $plugin = new Plugin(new Backend\Mock());
- $fakeServer->addPlugin($plugin);
- $fakeServer->emit('beforeMethod', [new HTTP\Request(), new HTTP\Response()]);
- $this->assertEquals('principals/admin', $plugin->getCurrentPrincipal());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/BasicNodeTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/BasicNodeTest.php
deleted file mode 100644
index ec104ec805e..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/BasicNodeTest.php
+++ /dev/null
@@ -1,235 +0,0 @@
-put('hi');
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\Forbidden
- */
- function testGet() {
-
- $file = new FileMock();
- $file->get();
-
- }
-
- function testGetSize() {
-
- $file = new FileMock();
- $this->assertEquals(0, $file->getSize());
-
- }
-
-
- function testGetETag() {
-
- $file = new FileMock();
- $this->assertNull($file->getETag());
-
- }
-
- function testGetContentType() {
-
- $file = new FileMock();
- $this->assertNull($file->getContentType());
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\Forbidden
- */
- function testDelete() {
-
- $file = new FileMock();
- $file->delete();
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\Forbidden
- */
- function testSetName() {
-
- $file = new FileMock();
- $file->setName('hi');
-
- }
-
- function testGetLastModified() {
-
- $file = new FileMock();
- // checking if lastmod is within the range of a few seconds
- $lastMod = $file->getLastModified();
- $compareTime = ($lastMod + 1) - time();
- $this->assertTrue($compareTime < 3);
-
- }
-
- function testGetChild() {
-
- $dir = new DirectoryMock();
- $file = $dir->getChild('mockfile');
- $this->assertTrue($file instanceof FileMock);
-
- }
-
- function testChildExists() {
-
- $dir = new DirectoryMock();
- $this->assertTrue($dir->childExists('mockfile'));
-
- }
-
- function testChildExistsFalse() {
-
- $dir = new DirectoryMock();
- $this->assertFalse($dir->childExists('mockfile2'));
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\NotFound
- */
- function testGetChild404() {
-
- $dir = new DirectoryMock();
- $file = $dir->getChild('blabla');
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\Forbidden
- */
- function testCreateFile() {
-
- $dir = new DirectoryMock();
- $dir->createFile('hello', 'data');
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\Forbidden
- */
- function testCreateDirectory() {
-
- $dir = new DirectoryMock();
- $dir->createDirectory('hello');
-
- }
-
- function testSimpleDirectoryConstruct() {
-
- $dir = new SimpleCollection('simpledir', []);
- $this->assertInstanceOf('Sabre\DAV\SimpleCollection', $dir);
-
- }
-
- /**
- * @depends testSimpleDirectoryConstruct
- */
- function testSimpleDirectoryConstructChild() {
-
- $file = new FileMock();
- $dir = new SimpleCollection('simpledir', [$file]);
- $file2 = $dir->getChild('mockfile');
-
- $this->assertEquals($file, $file2);
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception
- * @depends testSimpleDirectoryConstruct
- */
- function testSimpleDirectoryBadParam() {
-
- $dir = new SimpleCollection('simpledir', ['string shouldn\'t be here']);
-
- }
-
- /**
- * @depends testSimpleDirectoryConstruct
- */
- function testSimpleDirectoryAddChild() {
-
- $file = new FileMock();
- $dir = new SimpleCollection('simpledir');
- $dir->addChild($file);
- $file2 = $dir->getChild('mockfile');
-
- $this->assertEquals($file, $file2);
-
- }
-
- /**
- * @depends testSimpleDirectoryConstruct
- * @depends testSimpleDirectoryAddChild
- */
- function testSimpleDirectoryGetChildren() {
-
- $file = new FileMock();
- $dir = new SimpleCollection('simpledir');
- $dir->addChild($file);
-
- $this->assertEquals([$file], $dir->getChildren());
-
- }
-
- /*
- * @depends testSimpleDirectoryConstruct
- */
- function testSimpleDirectoryGetName() {
-
- $dir = new SimpleCollection('simpledir');
- $this->assertEquals('simpledir', $dir->getName());
-
- }
-
- /**
- * @depends testSimpleDirectoryConstruct
- * @expectedException Sabre\DAV\Exception\NotFound
- */
- function testSimpleDirectoryGetChild404() {
-
- $dir = new SimpleCollection('simpledir');
- $dir->getChild('blabla');
-
- }
-}
-
-class DirectoryMock extends Collection {
-
- function getName() {
-
- return 'mockdir';
-
- }
-
- function getChildren() {
-
- return [new FileMock()];
-
- }
-
-}
-
-class FileMock extends File {
-
- function getName() {
-
- return 'mockfile';
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php
deleted file mode 100644
index 54a3053ec9f..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Browser/GuessContentTypeTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-server->getPropertiesForPath('/somefile.jpg', $properties);
- $this->assertArrayHasKey(0, $result);
- $this->assertArrayHasKey(404, $result[0]);
- $this->assertArrayHasKey('{DAV:}getcontenttype', $result[0][404]);
-
- }
-
- /**
- * @depends testGetProperties
- */
- function testGetPropertiesPluginEnabled() {
-
- $this->server->addPlugin(new GuessContentType());
- $properties = [
- '{DAV:}getcontenttype',
- ];
- $result = $this->server->getPropertiesForPath('/somefile.jpg', $properties);
- $this->assertArrayHasKey(0, $result);
- $this->assertArrayHasKey(200, $result[0], 'We received: ' . print_r($result, true));
- $this->assertArrayHasKey('{DAV:}getcontenttype', $result[0][200]);
- $this->assertEquals('image/jpeg', $result[0][200]['{DAV:}getcontenttype']);
-
- }
-
- /**
- * @depends testGetPropertiesPluginEnabled
- */
- function testGetPropertiesUnknown() {
-
- $this->server->addPlugin(new GuessContentType());
- $properties = [
- '{DAV:}getcontenttype',
- ];
- $result = $this->server->getPropertiesForPath('/somefile.hoi', $properties);
- $this->assertArrayHasKey(0, $result);
- $this->assertArrayHasKey(200, $result[0]);
- $this->assertArrayHasKey('{DAV:}getcontenttype', $result[0][200]);
- $this->assertEquals('application/octet-stream', $result[0][200]['{DAV:}getcontenttype']);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php
deleted file mode 100644
index 33c4ede96b4..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Browser/MapGetToPropFindTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-server->addPlugin(new MapGetToPropFind());
-
- }
-
- function testCollectionGet() {
-
- $serverVars = [
- 'REQUEST_URI' => '/',
- 'REQUEST_METHOD' => 'GET',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('');
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals(207, $this->response->status, 'Incorrect status response received. Full response body: ' . $this->response->body);
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- 'DAV' => ['1, 3, extended-mkcol'],
- 'Vary' => ['Brief,Prefer'],
- ],
- $this->response->getHeaders()
- );
-
- }
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Browser/PluginTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Browser/PluginTest.php
deleted file mode 100644
index f20c50f8637..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Browser/PluginTest.php
+++ /dev/null
@@ -1,186 +0,0 @@
-server->addPlugin($this->plugin = new Plugin());
- $this->server->tree->getNodeForPath('')->createDirectory('dir2');
-
- }
-
- function testCollectionGet() {
-
- $request = new HTTP\Request('GET', '/dir');
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(200, $this->response->getStatus(), "Incorrect status received. Full response body: " . $this->response->getBodyAsString());
- $this->assertEquals(
- [
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['text/html; charset=utf-8'],
- 'Content-Security-Policy' => ["default-src 'none'; img-src 'self'; style-src 'self'; font-src 'self';"]
- ],
- $this->response->getHeaders()
- );
-
- $body = $this->response->getBodyAsString();
- $this->assertTrue(strpos($body, 'dir') !== false, $body);
- $this->assertTrue(strpos($body, '<a href="/dir/child.txt">') !== false);
-
- }
-
- /**
- * Adding the If-None-Match should have 0 effect, but it threw an error.
- */
- function testCollectionGetIfNoneMatch() {
-
- $request = new HTTP\Request('GET', '/dir');
- $request->setHeader('If-None-Match', '"foo-bar"');
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(200, $this->response->getStatus(), "Incorrect status received. Full response body: " . $this->response->getBodyAsString());
- $this->assertEquals(
- [
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['text/html; charset=utf-8'],
- 'Content-Security-Policy' => ["default-src 'none'; img-src 'self'; style-src 'self'; font-src 'self';"]
- ],
- $this->response->getHeaders()
- );
-
- $body = $this->response->getBodyAsString();
- $this->assertTrue(strpos($body, '<title>dir') !== false, $body);
- $this->assertTrue(strpos($body, '<a href="/dir/child.txt">') !== false);
-
- }
- function testCollectionGetRoot() {
-
- $request = new HTTP\Request('GET', '/');
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals(200, $this->response->status, "Incorrect status received. Full response body: " . $this->response->getBodyAsString());
- $this->assertEquals(
- [
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['text/html; charset=utf-8'],
- 'Content-Security-Policy' => ["default-src 'none'; img-src 'self'; style-src 'self'; font-src 'self';"]
- ],
- $this->response->getHeaders()
- );
-
- $body = $this->response->getBodyAsString();
- $this->assertTrue(strpos($body, '<title>/') !== false, $body);
- $this->assertTrue(strpos($body, '<a href="/dir/">') !== false);
- $this->assertTrue(strpos($body, '<span class="btn disabled">') !== false);
-
- }
-
- function testGETPassthru() {
-
- $request = new HTTP\Request('GET', '/random');
- $response = new HTTP\Response();
- $this->assertNull(
- $this->plugin->httpGet($request, $response)
- );
-
- }
-
- function testPostOtherContentType() {
-
- $request = new HTTP\Request('POST', '/', ['Content-Type' => 'text/xml']);
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(501, $this->response->status);
-
- }
-
- function testPostNoSabreAction() {
-
- $request = new HTTP\Request('POST', '/', ['Content-Type' => 'application/x-www-form-urlencoded']);
- $request->setPostData([]);
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(501, $this->response->status);
-
- }
-
- function testPostMkCol() {
-
- $serverVars = [
- 'REQUEST_URI' => '/',
- 'REQUEST_METHOD' => 'POST',
- 'CONTENT_TYPE' => 'application/x-www-form-urlencoded',
- ];
- $postVars = [
- 'sabreAction' => 'mkcol',
- 'name' => 'new_collection',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setPostData($postVars);
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(302, $this->response->status);
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Location' => ['/'],
- ], $this->response->getHeaders());
-
- $this->assertTrue(is_dir(SABRE_TEMPDIR . '/new_collection'));
-
- }
-
- function testGetAsset() {
-
- $request = new HTTP\Request('GET', '/?sabreAction=asset&assetName=favicon.ico');
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(200, $this->response->getStatus(), 'Error: ' . $this->response->body);
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['image/vnd.microsoft.icon'],
- 'Content-Length' => ['4286'],
- 'Cache-Control' => ['public, max-age=1209600'],
- 'Content-Security-Policy' => ["default-src 'none'; img-src 'self'; style-src 'self'; font-src 'self';"]
- ], $this->response->getHeaders());
-
- }
-
- function testGetAsset404() {
-
- $request = new HTTP\Request('GET', '/?sabreAction=asset&assetName=flavicon.ico');
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(404, $this->response->getStatus(), 'Error: ' . $this->response->body);
-
- }
-
- function testGetAssetEscapeBasePath() {
-
- $request = new HTTP\Request('GET', '/?sabreAction=asset&assetName=./../assets/favicon.ico');
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(404, $this->response->getStatus(), 'Error: ' . $this->response->body);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Browser/PropFindAllTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Browser/PropFindAllTest.php
deleted file mode 100644
index 08c2080bbab..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Browser/PropFindAllTest.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Browser;
-
-class PropFindAllTest extends \PHPUnit_Framework_TestCase {
-
- function testHandleSimple() {
-
- $pf = new PropFindAll('foo');
- $pf->handle('{DAV:}displayname', 'foo');
-
- $this->assertEquals(200, $pf->getStatus('{DAV:}displayname'));
- $this->assertEquals('foo', $pf->get('{DAV:}displayname'));
-
-
- }
-
- function testHandleCallBack() {
-
- $pf = new PropFindAll('foo');
- $pf->handle('{DAV:}displayname', function() { return 'foo'; });
-
- $this->assertEquals(200, $pf->getStatus('{DAV:}displayname'));
- $this->assertEquals('foo', $pf->get('{DAV:}displayname'));
-
- }
-
- function testSet() {
-
- $pf = new PropFindAll('foo');
- $pf->set('{DAV:}displayname', 'foo');
-
- $this->assertEquals(200, $pf->getStatus('{DAV:}displayname'));
- $this->assertEquals('foo', $pf->get('{DAV:}displayname'));
-
- }
-
- function testSetNull() {
-
- $pf = new PropFindAll('foo');
- $pf->set('{DAV:}displayname', null);
-
- $this->assertEquals(404, $pf->getStatus('{DAV:}displayname'));
- $this->assertEquals(null, $pf->get('{DAV:}displayname'));
-
- }
-
- function testGet404Properties() {
-
- $pf = new PropFindAll('foo');
- $pf->set('{DAV:}displayname', null);
- $this->assertEquals(
- ['{DAV:}displayname'],
- $pf->get404Properties()
- );
-
- }
-
- function testGet404PropertiesNothing() {
-
- $pf = new PropFindAll('foo');
- $pf->set('{DAV:}displayname', 'foo');
- $this->assertEquals(
- ['{http://sabredav.org/ns}idk'],
- $pf->get404Properties()
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ClientMock.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ClientMock.php
deleted file mode 100644
index 5a48b063ce8..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ClientMock.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\HTTP\RequestInterface;
-
-class ClientMock extends Client {
-
- public $request;
- public $response;
-
- public $url;
- public $curlSettings;
-
- /**
- * Just making this method public
- *
- * @param string $url
- * @return string
- */
- function getAbsoluteUrl($url) {
-
- return parent::getAbsoluteUrl($url);
-
- }
-
- function doRequest(RequestInterface $request) {
-
- $this->request = $request;
- return $this->response;
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ClientTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ClientTest.php
deleted file mode 100644
index 687f61e2fd2..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ClientTest.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\HTTP\Request;
-use Sabre\HTTP\Response;
-
-require_once 'Sabre/DAV/ClientMock.php';
-
-class ClientTest extends \PHPUnit_Framework_TestCase {
-
- function setUp() {
-
- if (!function_exists('curl_init')) {
- $this->markTestSkipped('CURL must be installed to test the client');
- }
-
- }
-
- function testConstruct() {
-
- $client = new ClientMock([
- 'baseUri' => '/',
- ]);
- $this->assertInstanceOf('Sabre\DAV\ClientMock', $client);
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testConstructNoBaseUri() {
-
- $client = new ClientMock([]);
-
- }
-
- function testAuth() {
-
- $client = new ClientMock([
- 'baseUri' => '/',
- 'userName' => 'foo',
- 'password' => 'bar',
- ]);
-
- $this->assertEquals("foo:bar", $client->curlSettings[CURLOPT_USERPWD]);
- $this->assertEquals(CURLAUTH_BASIC | CURLAUTH_DIGEST, $client->curlSettings[CURLOPT_HTTPAUTH]);
-
- }
-
- function testBasicAuth() {
-
- $client = new ClientMock([
- 'baseUri' => '/',
- 'userName' => 'foo',
- 'password' => 'bar',
- 'authType' => Client::AUTH_BASIC
- ]);
-
- $this->assertEquals("foo:bar", $client->curlSettings[CURLOPT_USERPWD]);
- $this->assertEquals(CURLAUTH_BASIC, $client->curlSettings[CURLOPT_HTTPAUTH]);
-
- }
-
- function testDigestAuth() {
-
- $client = new ClientMock([
- 'baseUri' => '/',
- 'userName' => 'foo',
- 'password' => 'bar',
- 'authType' => Client::AUTH_DIGEST
- ]);
-
- $this->assertEquals("foo:bar", $client->curlSettings[CURLOPT_USERPWD]);
- $this->assertEquals(CURLAUTH_DIGEST, $client->curlSettings[CURLOPT_HTTPAUTH]);
-
- }
-
- function testNTLMAuth() {
-
- $client = new ClientMock([
- 'baseUri' => '/',
- 'userName' => 'foo',
- 'password' => 'bar',
- 'authType' => Client::AUTH_NTLM
- ]);
-
- $this->assertEquals("foo:bar", $client->curlSettings[CURLOPT_USERPWD]);
- $this->assertEquals(CURLAUTH_NTLM, $client->curlSettings[CURLOPT_HTTPAUTH]);
-
- }
-
- function testProxy() {
-
- $client = new ClientMock([
- 'baseUri' => '/',
- 'proxy' => 'localhost:8888',
- ]);
-
- $this->assertEquals("localhost:8888", $client->curlSettings[CURLOPT_PROXY]);
-
- }
-
- function testEncoding() {
-
- $client = new ClientMock([
- 'baseUri' => '/',
- 'encoding' => Client::ENCODING_IDENTITY | Client::ENCODING_GZIP | Client::ENCODING_DEFLATE,
- ]);
-
- $this->assertEquals("identity,deflate,gzip", $client->curlSettings[CURLOPT_ENCODING]);
-
- }
-
- function testPropFind() {
-
- $client = new ClientMock([
- 'baseUri' => '/',
- ]);
-
- $responseBody = <<<XML
-<?xml version="1.0"?>
-<multistatus xmlns="DAV:">
- <response>
- <href>/foo</href>
- <propstat>
- <prop>
- <displayname>bar</displayname>
- </prop>
- <status>HTTP/1.1 200 OK</status>
- </propstat>
- </response>
-</multistatus>
-XML;
-
- $client->response = new Response(207, [], $responseBody);
- $result = $client->propFind('foo', ['{DAV:}displayname', '{urn:zim}gir']);
-
- $this->assertEquals(['{DAV:}displayname' => 'bar'], $result);
-
- $request = $client->request;
- $this->assertEquals('PROPFIND', $request->getMethod());
- $this->assertEquals('/foo', $request->getUrl());
- $this->assertEquals([
- 'Depth' => ['0'],
- 'Content-Type' => ['application/xml'],
- ], $request->getHeaders());
-
- }
-
- /**
- * @expectedException \Sabre\HTTP\ClientHttpException
- */
- function testPropFindError() {
-
- $client = new ClientMock([
- 'baseUri' => '/',
- ]);
-
- $client->response = new Response(405, []);
- $client->propFind('foo', ['{DAV:}displayname', '{urn:zim}gir']);
-
- }
-
- function testPropFindDepth1() {
-
- $client = new ClientMock([
- 'baseUri' => '/',
- ]);
-
- $responseBody = <<<XML
-<?xml version="1.0"?>
-<multistatus xmlns="DAV:">
- <response>
- <href>/foo</href>
- <propstat>
- <prop>
- <displayname>bar</displayname>
- </prop>
- <status>HTTP/1.1 200 OK</status>
- </propstat>
- </response>
-</multistatus>
-XML;
-
- $client->response = new Response(207, [], $responseBody);
- $result = $client->propFind('foo', ['{DAV:}displayname', '{urn:zim}gir'], 1);
-
- $this->assertEquals([
- '/foo' => [
- '{DAV:}displayname' => 'bar'
- ],
- ], $result);
-
- $request = $client->request;
- $this->assertEquals('PROPFIND', $request->getMethod());
- $this->assertEquals('/foo', $request->getUrl());
- $this->assertEquals([
- 'Depth' => ['1'],
- 'Content-Type' => ['application/xml'],
- ], $request->getHeaders());
-
- }
-
- function testPropPatch() {
-
- $client = new ClientMock([
- 'baseUri' => '/',
- ]);
-
- $responseBody = <<<XML
-<?xml version="1.0"?>
-<multistatus xmlns="DAV:">
- <response>
- <href>/foo</href>
- <propstat>
- <prop>
- <displayname>bar</displayname>
- </prop>
- <status>HTTP/1.1 200 OK</status>
- </propstat>
- </response>
-</multistatus>
-XML;
-
- $client->response = new Response(207, [], $responseBody);
- $result = $client->propPatch('foo', ['{DAV:}displayname' => 'hi', '{urn:zim}gir' => null]);
- $this->assertTrue($result);
- $request = $client->request;
- $this->assertEquals('PROPPATCH', $request->getMethod());
- $this->assertEquals('/foo', $request->getUrl());
- $this->assertEquals([
- 'Content-Type' => ['application/xml'],
- ], $request->getHeaders());
-
- }
-
- /**
- * @depends testPropPatch
- * @expectedException \Sabre\HTTP\ClientHttpException
- */
- function testPropPatchHTTPError() {
-
- $client = new ClientMock([
- 'baseUri' => '/',
- ]);
-
- $client->response = new Response(403, [], '');
- $client->propPatch('foo', ['{DAV:}displayname' => 'hi', '{urn:zim}gir' => null]);
-
- }
-
- /**
- * @depends testPropPatch
- * @expectedException Sabre\HTTP\ClientException
- */
- function testPropPatchMultiStatusError() {
-
- $client = new ClientMock([
- 'baseUri' => '/',
- ]);
-
- $responseBody = <<<XML
-<?xml version="1.0"?>
-<multistatus xmlns="DAV:">
-<response>
- <href>/foo</href>
- <propstat>
- <prop>
- <displayname />
- </prop>
- <status>HTTP/1.1 403 Forbidden</status>
- </propstat>
-</response>
-</multistatus>
-XML;
-
- $client->response = new Response(207, [], $responseBody);
- $client->propPatch('foo', ['{DAV:}displayname' => 'hi', '{urn:zim}gir' => null]);
-
- }
-
- function testOPTIONS() {
-
- $client = new ClientMock([
- 'baseUri' => '/',
- ]);
-
- $client->response = new Response(207, [
- 'DAV' => 'calendar-access, extended-mkcol',
- ]);
- $result = $client->options();
-
- $this->assertEquals(
- ['calendar-access', 'extended-mkcol'],
- $result
- );
-
- $request = $client->request;
- $this->assertEquals('OPTIONS', $request->getMethod());
- $this->assertEquals('/', $request->getUrl());
- $this->assertEquals([
- ], $request->getHeaders());
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/CorePluginTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/CorePluginTest.php
deleted file mode 100644
index 5c6f07ae80a..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/CorePluginTest.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-class CorePluginTest extends \PHPUnit_Framework_TestCase {
-
- function testGetInfo() {
-
- $corePlugin = new CorePlugin();
- $this->assertEquals('core', $corePlugin->getPluginInfo()['name']);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/DbTestHelperTrait.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/DbTestHelperTrait.php
deleted file mode 100644
index 63e35fb88ee..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/DbTestHelperTrait.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use PDO;
-use PDOException;
-
-class DbCache {
-
- static $cache = [];
-
-}
-
-trait DbTestHelperTrait {
-
- /**
- * Should be "mysql", "pgsql", "sqlite".
- */
- public $driver = null;
-
- /**
- * Returns a fully configured PDO object.
- *
- * @return PDO
- */
- function getDb() {
-
- if (!$this->driver) {
- throw new \Exception('You must set the $driver public property');
- }
-
- if (array_key_exists($this->driver, DbCache::$cache)) {
- $pdo = DbCache::$cache[$this->driver];
- if ($pdo === null) {
- $this->markTestSkipped($this->driver . ' was not enabled, not correctly configured or of the wrong version');
- }
- return $pdo;
- }
-
- try {
-
- switch ($this->driver) {
-
- case 'mysql' :
- $pdo = new PDO(SABRE_MYSQLDSN, SABRE_MYSQLUSER, SABRE_MYSQLPASS);
- break;
- case 'sqlite' :
- $pdo = new \PDO('sqlite:' . SABRE_TEMPDIR . '/testdb');
- break;
- case 'pgsql' :
- $pdo = new \PDO(SABRE_PGSQLDSN);
- $version = $pdo->query('SELECT VERSION()')->fetchColumn();
- preg_match('|([0-9\.]){5,}|', $version, $matches);
- $version = $matches[0];
- if (version_compare($version, '9.5.0', '<')) {
- DbCache::$cache[$this->driver] = null;
- $this->markTestSkipped('We require at least Postgres 9.5. This server is running ' . $version);
- }
- break;
-
-
-
- }
- $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
-
- } catch (PDOException $e) {
-
- $this->markTestSkipped($this->driver . ' was not enabled or not correctly configured. Error message: ' . $e->getMessage());
-
- }
-
- DbCache::$cache[$this->driver] = $pdo;
- return $pdo;
-
- }
-
- /**
- * Alias for getDb
- *
- * @return PDO
- */
- function getPDO() {
-
- return $this->getDb();
-
- }
-
- /**
- * Uses .sql files from the examples directory to initialize the database.
- *
- * @param string $schemaName
- * @return void
- */
- function createSchema($schemaName) {
-
- $db = $this->getDb();
-
- $queries = file_get_contents(
- __DIR__ . '/../../../examples/sql/' . $this->driver . '.' . $schemaName . '.sql'
- );
-
- foreach (explode(';', $queries) as $query) {
-
- if (trim($query) === '') {
- continue;
- }
-
- $db->exec($query);
-
- }
-
- }
-
- /**
- * Drops tables, if they exist
- *
- * @param string|string[] $tableNames
- * @return void
- */
- function dropTables($tableNames) {
-
- $tableNames = (array)$tableNames;
- $db = $this->getDb();
- foreach ($tableNames as $tableName) {
- $db->exec('DROP TABLE IF EXISTS ' . $tableName);
- }
-
-
- }
-
- function tearDown() {
-
- switch ($this->driver) {
-
- case 'sqlite' :
- // Recreating sqlite, just in case
- unset(DbCache::$cache[$this->driver]);
- unlink(SABRE_TEMPDIR . '/testdb');
- }
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Exception/LockedTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Exception/LockedTest.php
deleted file mode 100644
index 174a561b537..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Exception/LockedTest.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-use DOMDocument;
-use Sabre\DAV;
-
-class LockedTest extends \PHPUnit_Framework_TestCase {
-
- function testSerialize() {
-
- $dom = new DOMDocument('1.0');
- $dom->formatOutput = true;
- $root = $dom->createElement('d:root');
-
- $dom->appendChild($root);
- $root->setAttribute('xmlns:d', 'DAV:');
-
- $lockInfo = new DAV\Locks\LockInfo();
- $lockInfo->uri = '/foo';
- $locked = new Locked($lockInfo);
-
- $locked->serialize(new DAV\Server(), $root);
-
- $output = $dom->saveXML();
-
- $expected = '<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:lock-token-submitted xmlns:d="DAV:">
- <d:href>/foo</d:href>
- </d:lock-token-submitted>
-</d:root>
-';
-
- $this->assertEquals($expected, $output);
-
- }
-
- function testSerializeAmpersand() {
-
- $dom = new DOMDocument('1.0');
- $dom->formatOutput = true;
- $root = $dom->createElement('d:root');
-
- $dom->appendChild($root);
- $root->setAttribute('xmlns:d', 'DAV:');
-
- $lockInfo = new DAV\Locks\LockInfo();
- $lockInfo->uri = '/foo&bar';
- $locked = new Locked($lockInfo);
-
- $locked->serialize(new DAV\Server(), $root);
-
- $output = $dom->saveXML();
-
- $expected = '<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:lock-token-submitted xmlns:d="DAV:">
- <d:href>/foo&bar</d:href>
- </d:lock-token-submitted>
-</d:root>
-';
-
- $this->assertEquals($expected, $output);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Exception/PaymentRequiredTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Exception/PaymentRequiredTest.php
deleted file mode 100644
index 7142937b4c0..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Exception/PaymentRequiredTest.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-class PaymentRequiredTest extends \PHPUnit_Framework_TestCase {
-
- function testGetHTTPCode() {
-
- $ex = new PaymentRequired();
- $this->assertEquals(402, $ex->getHTTPCode());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Exception/ServiceUnavailableTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Exception/ServiceUnavailableTest.php
deleted file mode 100644
index 1cc691e6d38..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Exception/ServiceUnavailableTest.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-class ServiceUnavailableTest extends \PHPUnit_Framework_TestCase {
-
- function testGetHTTPCode() {
-
- $ex = new ServiceUnavailable();
- $this->assertEquals(503, $ex->getHTTPCode());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Exception/TooManyMatchesTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Exception/TooManyMatchesTest.php
deleted file mode 100644
index 0f58e8726be..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Exception/TooManyMatchesTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Exception;
-
-use DOMDocument;
-use Sabre\DAV;
-
-class TooManyMatchesTest extends \PHPUnit_Framework_TestCase {
-
- function testSerialize() {
-
- $dom = new DOMDocument('1.0');
- $dom->formatOutput = true;
- $root = $dom->createElement('d:root');
-
- $dom->appendChild($root);
- $root->setAttribute('xmlns:d', 'DAV:');
-
- $locked = new TooManyMatches();
-
- $locked->serialize(new DAV\Server(), $root);
-
- $output = $dom->saveXML();
-
- $expected = '<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:number-of-matches-within-limits xmlns:d="DAV:"/>
-</d:root>
-';
-
- $this->assertEquals($expected, $output);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ExceptionTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ExceptionTest.php
deleted file mode 100644
index 0eb4f3dd878..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ExceptionTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-class ExceptionTest extends \PHPUnit_Framework_TestCase {
-
- function testStatus() {
-
- $e = new Exception();
- $this->assertEquals(500, $e->getHTTPCode());
-
- }
-
- function testExceptionStatuses() {
-
- $c = [
- 'Sabre\\DAV\\Exception\\NotAuthenticated' => 401,
- 'Sabre\\DAV\\Exception\\InsufficientStorage' => 507,
- ];
-
- foreach ($c as $class => $status) {
-
- $obj = new $class();
- $this->assertEquals($status, $obj->getHTTPCode());
-
- }
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/FSExt/DirectoryTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/FSExt/DirectoryTest.php
deleted file mode 100644
index 097ebd26b92..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/FSExt/DirectoryTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Sabre\DAV\FSExt;
-
-class DirectoryTest extends \PHPUnit_Framework_TestCase {
-
- function create() {
-
- return new Directory(SABRE_TEMPDIR);
-
- }
-
- function testCreate() {
-
- $dir = $this->create();
- $this->assertEquals(basename(SABRE_TEMPDIR), $dir->getName());
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\Forbidden
- */
- function testChildExistDot() {
-
- $dir = $this->create();
- $dir->childExists('..');
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/FSExt/FileTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/FSExt/FileTest.php
deleted file mode 100644
index f5d65a44f96..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/FSExt/FileTest.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-namespace Sabre\DAV\FSExt;
-
-require_once 'Sabre/TestUtil.php';
-
-class FileTest extends \PHPUnit_Framework_TestCase {
-
- function setUp() {
-
- file_put_contents(SABRE_TEMPDIR . '/file.txt', 'Contents');
-
- }
-
- function tearDown() {
-
- \Sabre\TestUtil::clearTempDir();
-
- }
-
- function testPut() {
-
- $filename = SABRE_TEMPDIR . '/file.txt';
- $file = new File($filename);
- $result = $file->put('New contents');
-
- $this->assertEquals('New contents', file_get_contents(SABRE_TEMPDIR . '/file.txt'));
- $this->assertEquals(
- '"' .
- sha1(
- fileinode($filename) .
- filesize($filename) .
- filemtime($filename)
- ) . '"',
- $result
- );
-
- }
-
- function testRange() {
-
- $file = new File(SABRE_TEMPDIR . '/file.txt');
- $file->put('0000000');
- $file->patch('111', 2, 3);
-
- $this->assertEquals('0001110', file_get_contents(SABRE_TEMPDIR . '/file.txt'));
-
- }
-
- function testRangeStream() {
-
- $stream = fopen('php://memory', 'r+');
- fwrite($stream, "222");
- rewind($stream);
-
- $file = new File(SABRE_TEMPDIR . '/file.txt');
- $file->put('0000000');
- $file->patch($stream, 2, 3);
-
- $this->assertEquals('0002220', file_get_contents(SABRE_TEMPDIR . '/file.txt'));
-
- }
-
-
- function testGet() {
-
- $file = new File(SABRE_TEMPDIR . '/file.txt');
- $this->assertEquals('Contents', stream_get_contents($file->get()));
-
- }
-
- function testDelete() {
-
- $file = new File(SABRE_TEMPDIR . '/file.txt');
- $file->delete();
-
- $this->assertFalse(file_exists(SABRE_TEMPDIR . '/file.txt'));
-
- }
-
- function testGetETag() {
-
- $filename = SABRE_TEMPDIR . '/file.txt';
- $file = new File($filename);
- $this->assertEquals(
- '"' .
- sha1(
- fileinode($filename) .
- filesize($filename) .
- filemtime($filename)
- ) . '"',
- $file->getETag()
- );
- }
-
- function testGetContentType() {
-
- $file = new File(SABRE_TEMPDIR . '/file.txt');
- $this->assertNull($file->getContentType());
-
- }
-
- function testGetSize() {
-
- $file = new File(SABRE_TEMPDIR . '/file.txt');
- $this->assertEquals(8, $file->getSize());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/FSExt/ServerTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/FSExt/ServerTest.php
deleted file mode 100644
index 20fca490a35..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/FSExt/ServerTest.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-
-namespace Sabre\DAV\FSExt;
-
-use Sabre\DAV;
-use Sabre\HTTP;
-
-require_once 'Sabre/DAV/AbstractServer.php';
-
-class ServerTest extends DAV\AbstractServer{
-
- protected function getRootNode() {
-
- return new Directory($this->tempDir);
-
- }
-
- function testGet() {
-
- $request = new HTTP\Request('GET', '/test.txt');
- $filename = $this->tempDir . '/test.txt';
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(200, $this->response->getStatus(), 'Invalid status code received.');
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/octet-stream'],
- 'Content-Length' => [13],
- 'Last-Modified' => [HTTP\Util::toHTTPDate(new \DateTime('@' . filemtime($filename)))],
- 'ETag' => ['"' . sha1(fileinode($filename) . filesize($filename) . filemtime($filename)) . '"'],
- ],
- $this->response->getHeaders()
- );
-
-
- $this->assertEquals('Test contents', stream_get_contents($this->response->body));
-
- }
-
- function testHEAD() {
-
- $request = new HTTP\Request('HEAD', '/test.txt');
- $filename = $this->tempDir . '/test.txt';
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/octet-stream'],
- 'Content-Length' => [13],
- 'Last-Modified' => [HTTP\Util::toHTTPDate(new \DateTime('@' . filemtime($this->tempDir . '/test.txt')))],
- 'ETag' => ['"' . sha1(fileinode($filename) . filesize($filename) . filemtime($filename)) . '"'],
- ],
- $this->response->getHeaders()
- );
-
- $this->assertEquals(200, $this->response->status);
- $this->assertEquals('', $this->response->body);
-
- }
-
- function testPut() {
-
- $request = new HTTP\Request('PUT', '/testput.txt');
- $filename = $this->tempDir . '/testput.txt';
- $request->setBody('Testing new file');
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Length' => ['0'],
- 'ETag' => ['"' . sha1(fileinode($filename) . filesize($filename) . filemtime($filename)) . '"'],
- ], $this->response->getHeaders());
-
- $this->assertEquals(201, $this->response->status);
- $this->assertEquals('', $this->response->body);
- $this->assertEquals('Testing new file', file_get_contents($filename));
-
- }
-
- function testPutAlreadyExists() {
-
- $request = new HTTP\Request('PUT', '/test.txt', ['If-None-Match' => '*']);
- $request->setBody('Testing new file');
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $this->response->getHeaders());
-
- $this->assertEquals(412, $this->response->status);
- $this->assertNotEquals('Testing new file', file_get_contents($this->tempDir . '/test.txt'));
-
- }
-
- function testMkcol() {
-
- $request = new HTTP\Request('MKCOL', '/testcol');
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Length' => ['0'],
- ], $this->response->getHeaders());
-
- $this->assertEquals(201, $this->response->status);
- $this->assertEquals('', $this->response->body);
- $this->assertTrue(is_dir($this->tempDir . '/testcol'));
-
- }
-
- function testPutUpdate() {
-
- $request = new HTTP\Request('PUT', '/test.txt');
- $request->setBody('Testing updated file');
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals('0', $this->response->getHeader('Content-Length'));
-
- $this->assertEquals(204, $this->response->status);
- $this->assertEquals('', $this->response->body);
- $this->assertEquals('Testing updated file', file_get_contents($this->tempDir . '/test.txt'));
-
- }
-
- function testDelete() {
-
- $request = new HTTP\Request('DELETE', '/test.txt');
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Length' => ['0'],
- ], $this->response->getHeaders());
-
- $this->assertEquals(204, $this->response->status);
- $this->assertEquals('', $this->response->body);
- $this->assertFalse(file_exists($this->tempDir . '/test.txt'));
-
- }
-
- function testDeleteDirectory() {
-
- mkdir($this->tempDir . '/testcol');
- file_put_contents($this->tempDir . '/testcol/test.txt', 'Hi! I\'m a file with a short lifespan');
-
- $request = new HTTP\Request('DELETE', '/testcol');
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Length' => ['0'],
- ], $this->response->getHeaders());
- $this->assertEquals(204, $this->response->status);
- $this->assertEquals('', $this->response->body);
- $this->assertFalse(file_exists($this->tempDir . '/testcol'));
-
- }
-
- function testOptions() {
-
- $request = new HTTP\Request('OPTIONS', '/');
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'DAV' => ['1, 3, extended-mkcol'],
- 'MS-Author-Via' => ['DAV'],
- 'Allow' => ['OPTIONS, GET, HEAD, DELETE, PROPFIND, PUT, PROPPATCH, COPY, MOVE, REPORT'],
- 'Accept-Ranges' => ['bytes'],
- 'Content-Length' => ['0'],
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- ], $this->response->getHeaders());
-
- $this->assertEquals(200, $this->response->status);
- $this->assertEquals('', $this->response->body);
-
- }
-
- function testMove() {
-
- mkdir($this->tempDir . '/testcol');
-
- $request = new HTTP\Request('MOVE', '/test.txt', ['Destination' => '/testcol/test2.txt']);
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals(201, $this->response->status);
- $this->assertEquals('', $this->response->body);
-
- $this->assertEquals([
- 'Content-Length' => ['0'],
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- ], $this->response->getHeaders());
-
- $this->assertTrue(
- is_file($this->tempDir . '/testcol/test2.txt')
- );
-
-
- }
-
- /**
- * This test checks if it's possible to move a non-FSExt collection into a
- * FSExt collection.
- *
- * The moveInto function *should* ignore the object and let sabredav itself
- * execute the slow move.
- */
- function testMoveOtherObject() {
-
- mkdir($this->tempDir . '/tree1');
- mkdir($this->tempDir . '/tree2');
-
- $tree = new DAV\Tree(new DAV\SimpleCollection('root', [
- new DAV\FS\Directory($this->tempDir . '/tree1'),
- new DAV\FSExt\Directory($this->tempDir . '/tree2'),
- ]));
- $this->server->tree = $tree;
-
- $request = new HTTP\Request('MOVE', '/tree1', ['Destination' => '/tree2/tree1']);
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals(201, $this->response->status);
- $this->assertEquals('', $this->response->body);
-
- $this->assertEquals([
- 'Content-Length' => ['0'],
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- ], $this->response->getHeaders());
-
- $this->assertTrue(
- is_dir($this->tempDir . '/tree2/tree1')
- );
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/GetIfConditionsTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/GetIfConditionsTest.php
deleted file mode 100644
index d41abc00a2b..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/GetIfConditionsTest.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\HTTP;
-
-require_once 'Sabre/HTTP/ResponseMock.php';
-require_once 'Sabre/DAV/AbstractServer.php';
-
-class GetIfConditionsTest extends AbstractServer {
-
- function testNoConditions() {
-
- $request = new HTTP\Request();
-
- $conditions = $this->server->getIfConditions($request);
- $this->assertEquals([], $conditions);
-
- }
-
- function testLockToken() {
-
- $request = new HTTP\Request('GET', '/path/', ['If' => '(<opaquelocktoken:token1>)']);
- $conditions = $this->server->getIfConditions($request);
-
- $compare = [
-
- [
- 'uri' => 'path',
- 'tokens' => [
- [
- 'negate' => false,
- 'token' => 'opaquelocktoken:token1',
- 'etag' => '',
- ],
- ],
-
- ],
-
- ];
-
- $this->assertEquals($compare, $conditions);
-
- }
-
- function testNotLockToken() {
-
- $serverVars = [
- 'HTTP_IF' => '(Not <opaquelocktoken:token1>)',
- 'REQUEST_URI' => '/bla'
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $conditions = $this->server->getIfConditions($request);
-
- $compare = [
-
- [
- 'uri' => 'bla',
- 'tokens' => [
- [
- 'negate' => true,
- 'token' => 'opaquelocktoken:token1',
- 'etag' => '',
- ],
- ],
-
- ],
-
- ];
- $this->assertEquals($compare, $conditions);
-
- }
-
- function testLockTokenUrl() {
-
- $serverVars = [
- 'HTTP_IF' => '<http://www.example.com/> (<opaquelocktoken:token1>)',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $conditions = $this->server->getIfConditions($request);
-
- $compare = [
-
- [
- 'uri' => '',
- 'tokens' => [
- [
- 'negate' => false,
- 'token' => 'opaquelocktoken:token1',
- 'etag' => '',
- ],
- ],
-
- ],
-
- ];
- $this->assertEquals($compare, $conditions);
-
- }
-
- function test2LockTokens() {
-
- $serverVars = [
- 'HTTP_IF' => '(<opaquelocktoken:token1>) (Not <opaquelocktoken:token2>)',
- 'REQUEST_URI' => '/bla',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $conditions = $this->server->getIfConditions($request);
-
- $compare = [
-
- [
- 'uri' => 'bla',
- 'tokens' => [
- [
- 'negate' => false,
- 'token' => 'opaquelocktoken:token1',
- 'etag' => '',
- ],
- [
- 'negate' => true,
- 'token' => 'opaquelocktoken:token2',
- 'etag' => '',
- ],
- ],
-
- ],
-
- ];
- $this->assertEquals($compare, $conditions);
-
- }
-
- function test2UriLockTokens() {
-
- $serverVars = [
- 'HTTP_IF' => '<http://www.example.org/node1> (<opaquelocktoken:token1>) <http://www.example.org/node2> (Not <opaquelocktoken:token2>)',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $conditions = $this->server->getIfConditions($request);
-
- $compare = [
-
- [
- 'uri' => 'node1',
- 'tokens' => [
- [
- 'negate' => false,
- 'token' => 'opaquelocktoken:token1',
- 'etag' => '',
- ],
- ],
- ],
- [
- 'uri' => 'node2',
- 'tokens' => [
- [
- 'negate' => true,
- 'token' => 'opaquelocktoken:token2',
- 'etag' => '',
- ],
- ],
-
- ],
-
- ];
- $this->assertEquals($compare, $conditions);
-
- }
-
- function test2UriMultiLockTokens() {
-
- $serverVars = [
- 'HTTP_IF' => '<http://www.example.org/node1> (<opaquelocktoken:token1>) (<opaquelocktoken:token2>) <http://www.example.org/node2> (Not <opaquelocktoken:token3>)',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $conditions = $this->server->getIfConditions($request);
-
- $compare = [
-
- [
- 'uri' => 'node1',
- 'tokens' => [
- [
- 'negate' => false,
- 'token' => 'opaquelocktoken:token1',
- 'etag' => '',
- ],
- [
- 'negate' => false,
- 'token' => 'opaquelocktoken:token2',
- 'etag' => '',
- ],
- ],
- ],
- [
- 'uri' => 'node2',
- 'tokens' => [
- [
- 'negate' => true,
- 'token' => 'opaquelocktoken:token3',
- 'etag' => '',
- ],
- ],
-
- ],
-
- ];
- $this->assertEquals($compare, $conditions);
-
- }
-
- function testEtag() {
-
- $serverVars = [
- 'HTTP_IF' => '(["etag1"])',
- 'REQUEST_URI' => '/foo',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $conditions = $this->server->getIfConditions($request);
-
- $compare = [
-
- [
- 'uri' => 'foo',
- 'tokens' => [
- [
- 'negate' => false,
- 'token' => '',
- 'etag' => '"etag1"',
- ],
- ],
- ],
-
- ];
- $this->assertEquals($compare, $conditions);
-
- }
-
- function test2Etags() {
-
- $serverVars = [
- 'HTTP_IF' => '<http://www.example.org/> (["etag1"]) (["etag2"])',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $conditions = $this->server->getIfConditions($request);
-
- $compare = [
-
- [
- 'uri' => '',
- 'tokens' => [
- [
- 'negate' => false,
- 'token' => '',
- 'etag' => '"etag1"',
- ],
- [
- 'negate' => false,
- 'token' => '',
- 'etag' => '"etag2"',
- ],
- ],
- ],
-
- ];
- $this->assertEquals($compare, $conditions);
-
- }
-
- function testComplexIf() {
-
- $serverVars = [
- 'HTTP_IF' => '<http://www.example.org/node1> (<opaquelocktoken:token1> ["etag1"]) ' .
- '(Not <opaquelocktoken:token2>) (["etag2"]) <http://www.example.org/node2> ' .
- '(<opaquelocktoken:token3>) (Not <opaquelocktoken:token4>) (["etag3"])',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $conditions = $this->server->getIfConditions($request);
-
- $compare = [
-
- [
- 'uri' => 'node1',
- 'tokens' => [
- [
- 'negate' => false,
- 'token' => 'opaquelocktoken:token1',
- 'etag' => '"etag1"',
- ],
- [
- 'negate' => true,
- 'token' => 'opaquelocktoken:token2',
- 'etag' => '',
- ],
- [
- 'negate' => false,
- 'token' => '',
- 'etag' => '"etag2"',
- ],
- ],
- ],
- [
- 'uri' => 'node2',
- 'tokens' => [
- [
- 'negate' => false,
- 'token' => 'opaquelocktoken:token3',
- 'etag' => '',
- ],
- [
- 'negate' => true,
- 'token' => 'opaquelocktoken:token4',
- 'etag' => '',
- ],
- [
- 'negate' => false,
- 'token' => '',
- 'etag' => '"etag3"',
- ],
- ],
- ],
-
- ];
- $this->assertEquals($compare, $conditions);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HTTPPreferParsingTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HTTPPreferParsingTest.php
deleted file mode 100644
index cd8bee9686d..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HTTPPreferParsingTest.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\HTTP;
-
-class HTTPPreferParsingTest extends \Sabre\DAVServerTest {
-
- function testParseSimple() {
-
- $httpRequest = HTTP\Sapi::createFromServerArray([
- 'HTTP_PREFER' => 'return-asynch',
- ]);
-
- $server = new Server();
- $server->httpRequest = $httpRequest;
-
- $this->assertEquals([
- 'respond-async' => true,
- 'return' => null,
- 'handling' => null,
- 'wait' => null,
- ], $server->getHTTPPrefer());
-
- }
-
- function testParseValue() {
-
- $httpRequest = HTTP\Sapi::createFromServerArray([
- 'HTTP_PREFER' => 'wait=10',
- ]);
-
- $server = new Server();
- $server->httpRequest = $httpRequest;
-
- $this->assertEquals([
- 'respond-async' => false,
- 'return' => null,
- 'handling' => null,
- 'wait' => '10',
- ], $server->getHTTPPrefer());
-
- }
-
- function testParseMultiple() {
-
- $httpRequest = HTTP\Sapi::createFromServerArray([
- 'HTTP_PREFER' => 'return-minimal, strict,lenient',
- ]);
-
- $server = new Server();
- $server->httpRequest = $httpRequest;
-
- $this->assertEquals([
- 'respond-async' => false,
- 'return' => 'minimal',
- 'handling' => 'lenient',
- 'wait' => null,
- ], $server->getHTTPPrefer());
-
- }
-
- function testParseWeirdValue() {
-
- $httpRequest = HTTP\Sapi::createFromServerArray([
- 'HTTP_PREFER' => 'BOOOH',
- ]);
-
- $server = new Server();
- $server->httpRequest = $httpRequest;
-
- $this->assertEquals([
- 'respond-async' => false,
- 'return' => null,
- 'handling' => null,
- 'wait' => null,
- 'boooh' => true,
- ], $server->getHTTPPrefer());
-
- }
-
- function testBrief() {
-
- $httpRequest = HTTP\Sapi::createFromServerArray([
- 'HTTP_BRIEF' => 't',
- ]);
-
- $server = new Server();
- $server->httpRequest = $httpRequest;
-
- $this->assertEquals([
- 'respond-async' => false,
- 'return' => 'minimal',
- 'handling' => null,
- 'wait' => null,
- ], $server->getHTTPPrefer());
-
- }
-
- /**
- * propfindMinimal
- *
- * @return void
- */
- function testpropfindMinimal() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'PROPFIND',
- 'REQUEST_URI' => '/',
- 'HTTP_PREFER' => 'return-minimal',
- ]);
- $request->setBody(<<<BLA
-<?xml version="1.0"?>
-<d:propfind xmlns:d="DAV:">
- <d:prop>
- <d:something />
- <d:resourcetype />
- </d:prop>
-</d:propfind>
-BLA
- );
-
- $response = $this->request($request);
-
- $body = $response->getBodyAsString();
-
- $this->assertEquals(207, $response->getStatus(), $body);
-
- $this->assertTrue(strpos($body, 'resourcetype') !== false, $body);
- $this->assertTrue(strpos($body, 'something') === false, $body);
-
- }
-
- function testproppatchMinimal() {
-
- $request = new HTTP\Request('PROPPATCH', '/', ['Prefer' => 'return-minimal']);
- $request->setBody(<<<BLA
-<?xml version="1.0"?>
-<d:propertyupdate xmlns:d="DAV:">
- <d:set>
- <d:prop>
- <d:something>nope!</d:something>
- </d:prop>
- </d:set>
-</d:propertyupdate>
-BLA
- );
-
- $this->server->on('propPatch', function($path, PropPatch $propPatch) {
-
- $propPatch->handle('{DAV:}something', function($props) {
- return true;
- });
-
- });
-
- $response = $this->request($request);
-
- $this->assertEquals(0, strlen($response->body), 'Expected empty body: ' . $response->body);
- $this->assertEquals(204, $response->status);
-
- }
-
- function testproppatchMinimalError() {
-
- $request = new HTTP\Request('PROPPATCH', '/', ['Prefer' => 'return-minimal']);
- $request->setBody(<<<BLA
-<?xml version="1.0"?>
-<d:propertyupdate xmlns:d="DAV:">
- <d:set>
- <d:prop>
- <d:something>nope!</d:something>
- </d:prop>
- </d:set>
-</d:propertyupdate>
-BLA
- );
-
- $response = $this->request($request);
-
- $body = $response->getBodyAsString();
-
- $this->assertEquals(207, $response->status);
- $this->assertTrue(strpos($body, 'something') !== false);
- $this->assertTrue(strpos($body, '403 Forbidden') !== false, $body);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HttpCopyTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HttpCopyTest.php
deleted file mode 100644
index b5e64369ef9..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HttpCopyTest.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\DAVServerTest;
-use Sabre\HTTP;
-
-/**
- * Tests related to the COPY request.
- *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class HttpCopyTest extends DAVServerTest {
-
- /**
- * Sets up the DAV tree.
- *
- * @return void
- */
- function setUpTree() {
-
- $this->tree = new Mock\Collection('root', [
- 'file1' => 'content1',
- 'file2' => 'content2',
- 'coll1' => [
- 'file3' => 'content3',
- 'file4' => 'content4',
- ]
- ]);
-
- }
-
- function testCopyFile() {
-
- $request = new HTTP\Request('COPY', '/file1', [
- 'Destination' => '/file5'
- ]);
- $response = $this->request($request);
- $this->assertEquals(201, $response->getStatus());
- $this->assertEquals('content1', $this->tree->getChild('file5')->get());
-
- }
-
- function testCopyFileToSelf() {
-
- $request = new HTTP\Request('COPY', '/file1', [
- 'Destination' => '/file1'
- ]);
- $response = $this->request($request);
- $this->assertEquals(403, $response->getStatus());
-
- }
-
- function testCopyFileToExisting() {
-
- $request = new HTTP\Request('COPY', '/file1', [
- 'Destination' => '/file2'
- ]);
- $response = $this->request($request);
- $this->assertEquals(204, $response->getStatus());
- $this->assertEquals('content1', $this->tree->getChild('file2')->get());
-
- }
-
- function testCopyFileToExistingOverwriteT() {
-
- $request = new HTTP\Request('COPY', '/file1', [
- 'Destination' => '/file2',
- 'Overwrite' => 'T',
- ]);
- $response = $this->request($request);
- $this->assertEquals(204, $response->getStatus());
- $this->assertEquals('content1', $this->tree->getChild('file2')->get());
-
- }
-
- function testCopyFileToExistingOverwriteBadValue() {
-
- $request = new HTTP\Request('COPY', '/file1', [
- 'Destination' => '/file2',
- 'Overwrite' => 'B',
- ]);
- $response = $this->request($request);
- $this->assertEquals(400, $response->getStatus());
-
- }
-
- function testCopyFileNonExistantParent() {
-
- $request = new HTTP\Request('COPY', '/file1', [
- 'Destination' => '/notfound/file2',
- ]);
- $response = $this->request($request);
- $this->assertEquals(409, $response->getStatus());
-
- }
-
- function testCopyFileToExistingOverwriteF() {
-
- $request = new HTTP\Request('COPY', '/file1', [
- 'Destination' => '/file2',
- 'Overwrite' => 'F',
- ]);
- $response = $this->request($request);
- $this->assertEquals(412, $response->getStatus());
- $this->assertEquals('content2', $this->tree->getChild('file2')->get());
-
- }
-
- function testCopyFileToExistinBlockedCreateDestination() {
-
- $this->server->on('beforeBind', function($path) {
-
- if ($path === 'file2') {
- return false;
- }
-
- });
- $request = new HTTP\Request('COPY', '/file1', [
- 'Destination' => '/file2',
- 'Overwrite' => 'T',
- ]);
- $response = $this->request($request);
-
- // This checks if the destination file is intact.
- $this->assertEquals('content2', $this->tree->getChild('file2')->get());
-
- }
-
- function testCopyColl() {
-
- $request = new HTTP\Request('COPY', '/coll1', [
- 'Destination' => '/coll2'
- ]);
- $response = $this->request($request);
- $this->assertEquals(201, $response->getStatus());
- $this->assertEquals('content3', $this->tree->getChild('coll2')->getChild('file3')->get());
-
- }
-
- function testCopyCollToSelf() {
-
- $request = new HTTP\Request('COPY', '/coll1', [
- 'Destination' => '/coll1'
- ]);
- $response = $this->request($request);
- $this->assertEquals(403, $response->getStatus());
-
- }
-
- function testCopyCollToExisting() {
-
- $request = new HTTP\Request('COPY', '/coll1', [
- 'Destination' => '/file2'
- ]);
- $response = $this->request($request);
- $this->assertEquals(204, $response->getStatus());
- $this->assertEquals('content3', $this->tree->getChild('file2')->getChild('file3')->get());
-
- }
-
- function testCopyCollToExistingOverwriteT() {
-
- $request = new HTTP\Request('COPY', '/coll1', [
- 'Destination' => '/file2',
- 'Overwrite' => 'T',
- ]);
- $response = $this->request($request);
- $this->assertEquals(204, $response->getStatus());
- $this->assertEquals('content3', $this->tree->getChild('file2')->getChild('file3')->get());
-
- }
-
- function testCopyCollToExistingOverwriteF() {
-
- $request = new HTTP\Request('COPY', '/coll1', [
- 'Destination' => '/file2',
- 'Overwrite' => 'F',
- ]);
- $response = $this->request($request);
- $this->assertEquals(412, $response->getStatus());
- $this->assertEquals('content2', $this->tree->getChild('file2')->get());
-
- }
-
- function testCopyCollIntoSubtree() {
-
- $request = new HTTP\Request('COPY', '/coll1', [
- 'Destination' => '/coll1/subcol',
- ]);
- $response = $this->request($request);
- $this->assertEquals(409, $response->getStatus());
-
- }
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HttpDeleteTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HttpDeleteTest.php
deleted file mode 100644
index bd1b3315057..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HttpDeleteTest.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\DAVServerTest;
-use Sabre\HTTP;
-
-/**
- * Tests related to the PUT request.
- *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class HttpDeleteTest extends DAVServerTest {
-
- /**
- * Sets up the DAV tree.
- *
- * @return void
- */
- function setUpTree() {
-
- $this->tree = new Mock\Collection('root', [
- 'file1' => 'foo',
- 'dir' => [
- 'subfile' => 'bar',
- 'subfile2' => 'baz',
- ],
- ]);
-
- }
-
- /**
- * A successful DELETE
- */
- function testDelete() {
-
- $request = new HTTP\Request('DELETE', '/file1');
-
- $response = $this->request($request);
-
- $this->assertEquals(
- 204,
- $response->getStatus(),
- "Incorrect status code. Response body: " . $response->getBodyAsString()
- );
-
- $this->assertEquals(
- [
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Length' => ['0'],
- ],
- $response->getHeaders()
- );
-
- }
-
- /**
- * Deleting a Directory
- */
- function testDeleteDirectory() {
-
- $request = new HTTP\Request('DELETE', '/dir');
-
- $response = $this->request($request);
-
- $this->assertEquals(
- 204,
- $response->getStatus(),
- "Incorrect status code. Response body: " . $response->getBodyAsString()
- );
-
- $this->assertEquals(
- [
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Length' => ['0'],
- ],
- $response->getHeaders()
- );
-
- }
-
- /**
- * DELETE on a node that does not exist
- */
- function testDeleteNotFound() {
-
- $request = new HTTP\Request('DELETE', '/file2');
- $response = $this->request($request);
-
- $this->assertEquals(
- 404,
- $response->getStatus(),
- "Incorrect status code. Response body: " . $response->getBodyAsString()
- );
-
- }
-
- /**
- * DELETE with preconditions
- */
- function testDeletePreconditions() {
-
- $request = new HTTP\Request('DELETE', '/file1', [
- 'If-Match' => '"' . md5('foo') . '"',
- ]);
-
- $response = $this->request($request);
-
- $this->assertEquals(
- 204,
- $response->getStatus(),
- "Incorrect status code. Response body: " . $response->getBodyAsString()
- );
-
- }
-
- /**
- * DELETE with incorrect preconditions
- */
- function testDeletePreconditionsFailed() {
-
- $request = new HTTP\Request('DELETE', '/file1', [
- 'If-Match' => '"' . md5('bar') . '"',
- ]);
-
- $response = $this->request($request);
-
- $this->assertEquals(
- 412,
- $response->getStatus(),
- "Incorrect status code. Response body: " . $response->getBodyAsString()
- );
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HttpGetTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HttpGetTest.php
deleted file mode 100644
index 1eefba70657..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HttpGetTest.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\DAVServerTest;
-use Sabre\HTTP;
-
-/**
- * Tests related to the GET request.
- *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class HttpGetTest extends DAVServerTest {
-
- /**
- * Sets up the DAV tree.
- *
- * @return void
- */
- function setUpTree() {
-
- $this->tree = new Mock\Collection('root', [
- 'file1' => 'foo',
- new Mock\Collection('dir', []),
- new Mock\StreamingFile('streaming', 'stream')
- ]);
-
- }
-
- function testGet() {
-
- $request = new HTTP\Request('GET', '/file1');
- $response = $this->request($request);
-
- $this->assertEquals(200, $response->getStatus());
-
- // Removing Last-Modified because it keeps changing.
- $response->removeHeader('Last-Modified');
-
- $this->assertEquals(
- [
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/octet-stream'],
- 'Content-Length' => [3],
- 'ETag' => ['"' . md5('foo') . '"'],
- ],
- $response->getHeaders()
- );
-
- $this->assertEquals('foo', $response->getBodyAsString());
-
- }
-
- function testGetHttp10() {
-
- $request = new HTTP\Request('GET', '/file1');
- $request->setHttpVersion('1.0');
- $response = $this->request($request);
-
- $this->assertEquals(200, $response->getStatus());
-
- // Removing Last-Modified because it keeps changing.
- $response->removeHeader('Last-Modified');
-
- $this->assertEquals(
- [
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/octet-stream'],
- 'Content-Length' => [3],
- 'ETag' => ['"' . md5('foo') . '"'],
- ],
- $response->getHeaders()
- );
-
- $this->assertEquals('1.0', $response->getHttpVersion());
-
- $this->assertEquals('foo', $response->getBodyAsString());
-
- }
-
- function testGet404() {
-
- $request = new HTTP\Request('GET', '/notfound');
- $response = $this->request($request);
-
- $this->assertEquals(404, $response->getStatus());
-
- }
-
- function testGet404_aswell() {
-
- $request = new HTTP\Request('GET', '/file1/subfile');
- $response = $this->request($request);
-
- $this->assertEquals(404, $response->getStatus());
-
- }
-
- /**
- * We automatically normalize double slashes.
- */
- function testGetDoubleSlash() {
-
- $request = new HTTP\Request('GET', '//file1');
- $response = $this->request($request);
-
- $this->assertEquals(200, $response->getStatus());
-
- // Removing Last-Modified because it keeps changing.
- $response->removeHeader('Last-Modified');
-
- $this->assertEquals(
- [
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/octet-stream'],
- 'Content-Length' => [3],
- 'ETag' => ['"' . md5('foo') . '"'],
- ],
- $response->getHeaders()
- );
-
- $this->assertEquals('foo', $response->getBodyAsString());
-
- }
-
- function testGetCollection() {
-
- $request = new HTTP\Request('GET', '/dir');
- $response = $this->request($request);
-
- $this->assertEquals(501, $response->getStatus());
-
- }
-
- function testGetStreaming() {
-
- $request = new HTTP\Request('GET', '/streaming');
- $response = $this->request($request);
-
- $this->assertEquals(200, $response->getStatus());
-
- // Removing Last-Modified because it keeps changing.
- $response->removeHeader('Last-Modified');
-
- $this->assertEquals(
- [
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/octet-stream'],
- ],
- $response->getHeaders()
- );
-
- $this->assertEquals('stream', $response->getBodyAsString());
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HttpHeadTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HttpHeadTest.php
deleted file mode 100644
index 2cd1c5ea3c1..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HttpHeadTest.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\DAVServerTest;
-use Sabre\HTTP;
-
-/**
- * Tests related to the HEAD request.
- *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class HttpHeadTest extends DAVServerTest {
-
- /**
- * Sets up the DAV tree.
- *
- * @return void
- */
- function setUpTree() {
-
- $this->tree = new Mock\Collection('root', [
- 'file1' => 'foo',
- new Mock\Collection('dir', []),
- new Mock\StreamingFile('streaming', 'stream')
- ]);
-
- }
-
- function testHEAD() {
-
- $request = new HTTP\Request('HEAD', '//file1');
- $response = $this->request($request);
-
- $this->assertEquals(200, $response->getStatus());
-
- // Removing Last-Modified because it keeps changing.
- $response->removeHeader('Last-Modified');
-
- $this->assertEquals(
- [
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/octet-stream'],
- 'Content-Length' => [3],
- 'ETag' => ['"' . md5('foo') . '"'],
- ],
- $response->getHeaders()
- );
-
- $this->assertEquals('', $response->getBodyAsString());
-
- }
-
- /**
- * According to the specs, HEAD should behave identical to GET. But, broken
- * clients needs HEAD requests on collections to respond with a 200, so
- * that's what we do.
- */
- function testHEADCollection() {
-
- $request = new HTTP\Request('HEAD', '/dir');
- $response = $this->request($request);
-
- $this->assertEquals(200, $response->getStatus());
-
- }
-
- /**
- * HEAD automatically internally maps to GET via a sub-request.
- * The Auth plugin must not be triggered twice for these, so we'll
- * test for that.
- */
- function testDoubleAuth() {
-
- $count = 0;
-
- $authBackend = new Auth\Backend\BasicCallBack(function($userName, $password) use (&$count) {
- $count++;
- return true;
- });
- $this->server->addPlugin(
- new Auth\Plugin(
- $authBackend
- )
- );
- $request = new HTTP\Request('HEAD', '/file1', ['Authorization' => 'Basic ' . base64_encode('user:pass')]);
- $response = $this->request($request);
-
- $this->assertEquals(200, $response->getStatus());
-
- $this->assertEquals(1, $count, 'Auth was triggered twice :(');
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HttpMoveTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HttpMoveTest.php
deleted file mode 100644
index 52f7c674ee9..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HttpMoveTest.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\DAVServerTest;
-use Sabre\HTTP;
-
-/**
- * Tests related to the MOVE request.
- *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class HttpMoveTest extends DAVServerTest {
-
- /**
- * Sets up the DAV tree.
- *
- * @return void
- */
- function setUpTree() {
-
- $this->tree = new Mock\Collection('root', [
- 'file1' => 'content1',
- 'file2' => 'content2',
- ]);
-
- }
-
- function testMoveToSelf() {
-
- $request = new HTTP\Request('MOVE', '/file1', [
- 'Destination' => '/file1'
- ]);
- $response = $this->request($request);
- $this->assertEquals(403, $response->getStatus());
- $this->assertEquals('content1', $this->tree->getChild('file1')->get());
-
- }
-
- function testMove() {
-
- $request = new HTTP\Request('MOVE', '/file1', [
- 'Destination' => '/file3'
- ]);
- $response = $this->request($request);
- $this->assertEquals(201, $response->getStatus(), print_r($response, true));
- $this->assertEquals('content1', $this->tree->getChild('file3')->get());
- $this->assertFalse($this->tree->childExists('file1'));
-
- }
-
- function testMoveToExisting() {
-
- $request = new HTTP\Request('MOVE', '/file1', [
- 'Destination' => '/file2'
- ]);
- $response = $this->request($request);
- $this->assertEquals(204, $response->getStatus(), print_r($response, true));
- $this->assertEquals('content1', $this->tree->getChild('file2')->get());
- $this->assertFalse($this->tree->childExists('file1'));
-
- }
-
- function testMoveToExistingOverwriteT() {
-
- $request = new HTTP\Request('MOVE', '/file1', [
- 'Destination' => '/file2',
- 'Overwrite' => 'T',
- ]);
- $response = $this->request($request);
- $this->assertEquals(204, $response->getStatus(), print_r($response, true));
- $this->assertEquals('content1', $this->tree->getChild('file2')->get());
- $this->assertFalse($this->tree->childExists('file1'));
-
- }
-
- function testMoveToExistingOverwriteF() {
-
- $request = new HTTP\Request('MOVE', '/file1', [
- 'Destination' => '/file2',
- 'Overwrite' => 'F',
- ]);
- $response = $this->request($request);
- $this->assertEquals(412, $response->getStatus(), print_r($response, true));
- $this->assertEquals('content1', $this->tree->getChild('file1')->get());
- $this->assertEquals('content2', $this->tree->getChild('file2')->get());
- $this->assertTrue($this->tree->childExists('file1'));
- $this->assertTrue($this->tree->childExists('file2'));
-
- }
-
- /**
- * If we MOVE to an existing file, but a plugin prevents the original from
- * being deleted, we need to make sure that the server does not delete
- * the destination.
- */
- function testMoveToExistingBlockedDeleteSource() {
-
- $this->server->on('beforeUnbind', function($path) {
-
- if ($path === 'file1') {
- throw new \Sabre\DAV\Exception\Forbidden('uh oh');
- }
-
- });
- $request = new HTTP\Request('MOVE', '/file1', [
- 'Destination' => '/file2'
- ]);
- $response = $this->request($request);
- $this->assertEquals(403, $response->getStatus(), print_r($response, true));
- $this->assertEquals('content1', $this->tree->getChild('file1')->get());
- $this->assertEquals('content2', $this->tree->getChild('file2')->get());
- $this->assertTrue($this->tree->childExists('file1'));
- $this->assertTrue($this->tree->childExists('file2'));
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HttpPutTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HttpPutTest.php
deleted file mode 100644
index 86480b1c22a..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/HttpPutTest.php
+++ /dev/null
@@ -1,349 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\DAVServerTest;
-use Sabre\HTTP;
-
-/**
- * Tests related to the PUT request.
- *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class HttpPutTest extends DAVServerTest {
-
- /**
- * Sets up the DAV tree.
- *
- * @return void
- */
- function setUpTree() {
-
- $this->tree = new Mock\Collection('root', [
- 'file1' => 'foo',
- ]);
-
- }
-
- /**
- * A successful PUT of a new file.
- */
- function testPut() {
-
- $request = new HTTP\Request('PUT', '/file2', [], 'hello');
-
- $response = $this->request($request);
-
- $this->assertEquals(201, $response->getStatus(), 'Incorrect status code received. Full response body:' . $response->getBodyAsString());
-
- $this->assertEquals(
- 'hello',
- $this->server->tree->getNodeForPath('file2')->get()
- );
-
- $this->assertEquals(
- [
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Length' => ['0'],
- 'ETag' => ['"' . md5('hello') . '"']
- ],
- $response->getHeaders()
- );
-
- }
-
- /**
- * A successful PUT on an existing file.
- *
- * @depends testPut
- */
- function testPutExisting() {
-
- $request = new HTTP\Request('PUT', '/file1', [], 'bar');
-
- $response = $this->request($request);
-
- $this->assertEquals(204, $response->getStatus());
-
- $this->assertEquals(
- 'bar',
- $this->server->tree->getNodeForPath('file1')->get()
- );
-
- $this->assertEquals(
- [
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Length' => ['0'],
- 'ETag' => ['"' . md5('bar') . '"']
- ],
- $response->getHeaders()
- );
-
- }
-
- /**
- * PUT on existing file with If-Match: *
- *
- * @depends testPutExisting
- */
- function testPutExistingIfMatchStar() {
-
- $request = new HTTP\Request(
- 'PUT',
- '/file1',
- ['If-Match' => '*'],
- 'hello'
- );
-
- $response = $this->request($request);
-
- $this->assertEquals(204, $response->getStatus());
-
- $this->assertEquals(
- 'hello',
- $this->server->tree->getNodeForPath('file1')->get()
- );
-
- $this->assertEquals(
- [
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Length' => ['0'],
- 'ETag' => ['"' . md5('hello') . '"']
- ],
- $response->getHeaders()
- );
-
- }
-
- /**
- * PUT on existing file with If-Match: with a correct etag
- *
- * @depends testPutExisting
- */
- function testPutExistingIfMatchCorrect() {
-
- $request = new HTTP\Request(
- 'PUT',
- '/file1',
- ['If-Match' => '"' . md5('foo') . '"'],
- 'hello'
- );
-
- $response = $this->request($request);
-
- $this->assertEquals(204, $response->status);
-
- $this->assertEquals(
- 'hello',
- $this->server->tree->getNodeForPath('file1')->get()
- );
-
- $this->assertEquals(
- [
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Length' => ['0'],
- 'ETag' => ['"' . md5('hello') . '"'],
- ],
- $response->getHeaders()
- );
-
- }
-
- /**
- * PUT with Content-Range should be rejected.
- *
- * @depends testPut
- */
- function testPutContentRange() {
-
- $request = new HTTP\Request(
- 'PUT',
- '/file2',
- ['Content-Range' => 'bytes/100-200'],
- 'hello'
- );
-
- $response = $this->request($request);
- $this->assertEquals(400, $response->getStatus());
-
- }
-
- /**
- * PUT on non-existing file with If-None-Match: * should work.
- *
- * @depends testPut
- */
- function testPutIfNoneMatchStar() {
-
- $request = new HTTP\Request(
- 'PUT',
- '/file2',
- ['If-None-Match' => '*'],
- 'hello'
- );
-
- $response = $this->request($request);
-
- $this->assertEquals(201, $response->getStatus());
-
- $this->assertEquals(
- 'hello',
- $this->server->tree->getNodeForPath('file2')->get()
- );
-
- $this->assertEquals(
- [
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Length' => ['0'],
- 'ETag' => ['"' . md5('hello') . '"']
- ],
- $response->getHeaders()
- );
-
- }
-
- /**
- * PUT on non-existing file with If-Match: * should fail.
- *
- * @depends testPut
- */
- function testPutIfMatchStar() {
-
- $request = new HTTP\Request(
- 'PUT',
- '/file2',
- ['If-Match' => '*'],
- 'hello'
- );
-
- $response = $this->request($request);
-
- $this->assertEquals(412, $response->getStatus());
-
- }
-
- /**
- * PUT on existing file with If-None-Match: * should fail.
- *
- * @depends testPut
- */
- function testPutExistingIfNoneMatchStar() {
-
- $request = new HTTP\Request(
- 'PUT',
- '/file1',
- ['If-None-Match' => '*'],
- 'hello'
- );
- $request->setBody('hello');
-
- $response = $this->request($request);
-
- $this->assertEquals(412, $response->getStatus());
-
- }
-
- /**
- * PUT thats created in a non-collection should be rejected.
- *
- * @depends testPut
- */
- function testPutNoParent() {
-
- $request = new HTTP\Request(
- 'PUT',
- '/file1/file2',
- [],
- 'hello'
- );
-
- $response = $this->request($request);
- $this->assertEquals(409, $response->getStatus());
-
- }
-
- /**
- * Finder may sometimes make a request, which gets its content-body
- * stripped. We can't always prevent this from happening, but in some cases
- * we can detected this and return an error instead.
- *
- * @depends testPut
- */
- function testFinderPutSuccess() {
-
- $request = new HTTP\Request(
- 'PUT',
- '/file2',
- ['X-Expected-Entity-Length' => '5'],
- 'hello'
- );
- $response = $this->request($request);
-
- $this->assertEquals(201, $response->getStatus());
-
- $this->assertEquals(
- 'hello',
- $this->server->tree->getNodeForPath('file2')->get()
- );
-
- $this->assertEquals(
- [
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Length' => ['0'],
- 'ETag' => ['"' . md5('hello') . '"'],
- ],
- $response->getHeaders()
- );
-
- }
-
- /**
- * Same as the last one, but in this case we're mimicing a failed request.
- *
- * @depends testFinderPutSuccess
- */
- function testFinderPutFail() {
-
- $request = new HTTP\Request(
- 'PUT',
- '/file2',
- ['X-Expected-Entity-Length' => '5'],
- ''
- );
-
- $response = $this->request($request);
-
- $this->assertEquals(403, $response->getStatus());
-
- }
-
- /**
- * Plugins can intercept PUT. We need to make sure that works.
- *
- * @depends testPut
- */
- function testPutIntercept() {
-
- $this->server->on('beforeBind', function($uri) {
- $this->server->httpResponse->setStatus(418);
- return false;
- });
-
- $request = new HTTP\Request('PUT', '/file2', [], 'hello');
- $response = $this->request($request);
-
- $this->assertEquals(418, $response->getStatus(), 'Incorrect status code received. Full response body: ' . $response->getBodyAsString());
-
- $this->assertFalse(
- $this->server->tree->nodeExists('file2')
- );
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- ], $response->getHeaders());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Issue33Test.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Issue33Test.php
deleted file mode 100644
index ba2cf3dc152..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Issue33Test.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\HTTP;
-
-require_once 'Sabre/TestUtil.php';
-
-class Issue33Test extends \PHPUnit_Framework_TestCase {
-
- function setUp() {
-
- \Sabre\TestUtil::clearTempDir();
-
- }
-
- function testCopyMoveInfo() {
-
- $bar = new SimpleCollection('bar');
- $root = new SimpleCollection('webdav', [$bar]);
-
- $server = new Server($root);
- $server->setBaseUri('/webdav/');
-
- $serverVars = [
- 'REQUEST_URI' => '/webdav/bar',
- 'HTTP_DESTINATION' => 'http://dev2.tribalos.com/webdav/%C3%A0fo%C3%B3',
- 'HTTP_OVERWRITE' => 'F',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
-
- $server->httpRequest = $request;
-
- $info = $server->getCopyAndMoveInfo($request);
-
- $this->assertEquals('%C3%A0fo%C3%B3', urlencode($info['destination']));
- $this->assertFalse($info['destinationExists']);
- $this->assertFalse($info['destinationNode']);
-
- }
-
- function testTreeMove() {
-
- mkdir(SABRE_TEMPDIR . '/issue33');
- $dir = new FS\Directory(SABRE_TEMPDIR . '/issue33');
-
- $dir->createDirectory('bar');
-
- $tree = new Tree($dir);
- $tree->move('bar', urldecode('%C3%A0fo%C3%B3'));
-
- $node = $tree->getNodeForPath(urldecode('%C3%A0fo%C3%B3'));
- $this->assertEquals(urldecode('%C3%A0fo%C3%B3'), $node->getName());
-
- }
-
- function testDirName() {
-
- $dirname1 = 'bar';
- $dirname2 = urlencode('%C3%A0fo%C3%B3');
-
- $this->assertTrue(dirname($dirname1) == dirname($dirname2));
-
- }
-
- /**
- * @depends testTreeMove
- * @depends testCopyMoveInfo
- */
- function testEverything() {
-
- // Request object
- $serverVars = [
- 'REQUEST_METHOD' => 'MOVE',
- 'REQUEST_URI' => '/webdav/bar',
- 'HTTP_DESTINATION' => 'http://dev2.tribalos.com/webdav/%C3%A0fo%C3%B3',
- 'HTTP_OVERWRITE' => 'F',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('');
-
- $response = new HTTP\ResponseMock();
-
- // Server setup
- mkdir(SABRE_TEMPDIR . '/issue33');
- $dir = new FS\Directory(SABRE_TEMPDIR . '/issue33');
-
- $dir->createDirectory('bar');
-
- $tree = new Tree($dir);
-
- $server = new Server($tree);
- $server->setBaseUri('/webdav/');
-
- $server->httpRequest = $request;
- $server->httpResponse = $response;
- $server->sapi = new HTTP\SapiMock();
- $server->exec();
-
- $this->assertTrue(file_exists(SABRE_TEMPDIR . '/issue33/' . urldecode('%C3%A0fo%C3%B3')));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/AbstractTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/AbstractTest.php
deleted file mode 100644
index bbde69097a5..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/AbstractTest.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Locks\Backend;
-
-use Sabre\DAV;
-
-abstract class AbstractTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * @abstract
- * @return AbstractBackend
- */
- abstract function getBackend();
-
- function testSetup() {
-
- $backend = $this->getBackend();
- $this->assertInstanceOf('Sabre\\DAV\\Locks\\Backend\\AbstractBackend', $backend);
-
- }
-
- /**
- * @depends testSetup
- */
- function testGetLocks() {
-
- $backend = $this->getBackend();
-
- $lock = new DAV\Locks\LockInfo();
- $lock->owner = 'Sinterklaas';
- $lock->timeout = 60;
- $lock->created = time();
- $lock->token = 'MY-UNIQUE-TOKEN';
- $lock->uri = 'someuri';
-
- $this->assertTrue($backend->lock('someuri', $lock));
-
- $locks = $backend->getLocks('someuri', false);
-
- $this->assertEquals(1, count($locks));
- $this->assertEquals('Sinterklaas', $locks[0]->owner);
- $this->assertEquals('someuri', $locks[0]->uri);
-
- }
-
- /**
- * @depends testGetLocks
- */
- function testGetLocksParent() {
-
- $backend = $this->getBackend();
-
- $lock = new DAV\Locks\LockInfo();
- $lock->owner = 'Sinterklaas';
- $lock->timeout = 60;
- $lock->created = time();
- $lock->depth = DAV\Server::DEPTH_INFINITY;
- $lock->token = 'MY-UNIQUE-TOKEN';
-
- $this->assertTrue($backend->lock('someuri', $lock));
-
- $locks = $backend->getLocks('someuri/child', false);
-
- $this->assertEquals(1, count($locks));
- $this->assertEquals('Sinterklaas', $locks[0]->owner);
- $this->assertEquals('someuri', $locks[0]->uri);
-
- }
-
-
- /**
- * @depends testGetLocks
- */
- function testGetLocksParentDepth0() {
-
- $backend = $this->getBackend();
-
- $lock = new DAV\Locks\LockInfo();
- $lock->owner = 'Sinterklaas';
- $lock->timeout = 60;
- $lock->created = time();
- $lock->depth = 0;
- $lock->token = 'MY-UNIQUE-TOKEN';
-
- $this->assertTrue($backend->lock('someuri', $lock));
-
- $locks = $backend->getLocks('someuri/child', false);
-
- $this->assertEquals(0, count($locks));
-
- }
-
- function testGetLocksChildren() {
-
- $backend = $this->getBackend();
-
- $lock = new DAV\Locks\LockInfo();
- $lock->owner = 'Sinterklaas';
- $lock->timeout = 60;
- $lock->created = time();
- $lock->depth = 0;
- $lock->token = 'MY-UNIQUE-TOKEN';
-
- $this->assertTrue($backend->lock('someuri/child', $lock));
-
- $locks = $backend->getLocks('someuri/child', false);
- $this->assertEquals(1, count($locks));
-
- $locks = $backend->getLocks('someuri', false);
- $this->assertEquals(0, count($locks));
-
- $locks = $backend->getLocks('someuri', true);
- $this->assertEquals(1, count($locks));
-
- }
-
- /**
- * @depends testGetLocks
- */
- function testLockRefresh() {
-
- $backend = $this->getBackend();
-
- $lock = new DAV\Locks\LockInfo();
- $lock->owner = 'Sinterklaas';
- $lock->timeout = 60;
- $lock->created = time();
- $lock->token = 'MY-UNIQUE-TOKEN';
-
- $this->assertTrue($backend->lock('someuri', $lock));
- /* Second time */
-
- $lock->owner = 'Santa Clause';
- $this->assertTrue($backend->lock('someuri', $lock));
-
- $locks = $backend->getLocks('someuri', false);
-
- $this->assertEquals(1, count($locks));
-
- $this->assertEquals('Santa Clause', $locks[0]->owner);
- $this->assertEquals('someuri', $locks[0]->uri);
-
- }
-
- /**
- * @depends testGetLocks
- */
- function testUnlock() {
-
- $backend = $this->getBackend();
-
- $lock = new DAV\Locks\LockInfo();
- $lock->owner = 'Sinterklaas';
- $lock->timeout = 60;
- $lock->created = time();
- $lock->token = 'MY-UNIQUE-TOKEN';
-
- $this->assertTrue($backend->lock('someuri', $lock));
-
- $locks = $backend->getLocks('someuri', false);
- $this->assertEquals(1, count($locks));
-
- $this->assertTrue($backend->unlock('someuri', $lock));
-
- $locks = $backend->getLocks('someuri', false);
- $this->assertEquals(0, count($locks));
-
- }
-
- /**
- * @depends testUnlock
- */
- function testUnlockUnknownToken() {
-
- $backend = $this->getBackend();
-
- $lock = new DAV\Locks\LockInfo();
- $lock->owner = 'Sinterklaas';
- $lock->timeout = 60;
- $lock->created = time();
- $lock->token = 'MY-UNIQUE-TOKEN';
-
- $this->assertTrue($backend->lock('someuri', $lock));
-
- $locks = $backend->getLocks('someuri', false);
- $this->assertEquals(1, count($locks));
-
- $lock->token = 'SOME-OTHER-TOKEN';
- $this->assertFalse($backend->unlock('someuri', $lock));
-
- $locks = $backend->getLocks('someuri', false);
- $this->assertEquals(1, count($locks));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/FileTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/FileTest.php
deleted file mode 100644
index 537996f3bbf..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/FileTest.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Locks\Backend;
-
-require_once 'Sabre/TestUtil.php';
-
-class FileTest extends AbstractTest {
-
- function getBackend() {
-
- \Sabre\TestUtil::clearTempDir();
- $backend = new File(SABRE_TEMPDIR . '/lockdb');
- return $backend;
-
- }
-
-
- function tearDown() {
-
- \Sabre\TestUtil::clearTempDir();
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/Mock.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/Mock.php
deleted file mode 100644
index dd475807178..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/Mock.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Locks\Backend;
-
-use Sabre\DAV\Locks\LockInfo;
-
-/**
- * Locks Mock backend.
- *
- * This backend stores lock information in memory. Mainly useful for testing.
- *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Mock extends AbstractBackend {
-
- /**
- * Returns a list of Sabre\DAV\Locks\LockInfo objects
- *
- * This method should return all the locks for a particular uri, including
- * locks that might be set on a parent uri.
- *
- * If returnChildLocks is set to true, this method should also look for
- * any locks in the subtree of the uri for locks.
- *
- * @param string $uri
- * @param bool $returnChildLocks
- * @return array
- */
- function getLocks($uri, $returnChildLocks) {
-
- $newLocks = [];
-
- $locks = $this->getData();
-
- foreach ($locks as $lock) {
-
- if ($lock->uri === $uri ||
- //deep locks on parents
- ($lock->depth != 0 && strpos($uri, $lock->uri . '/') === 0) ||
-
- // locks on children
- ($returnChildLocks && (strpos($lock->uri, $uri . '/') === 0))) {
-
- $newLocks[] = $lock;
-
- }
-
- }
-
- // Checking if we can remove any of these locks
- foreach ($newLocks as $k => $lock) {
- if (time() > $lock->timeout + $lock->created) unset($newLocks[$k]);
- }
- return $newLocks;
-
- }
-
- /**
- * Locks a uri
- *
- * @param string $uri
- * @param LockInfo $lockInfo
- * @return bool
- */
- function lock($uri, LockInfo $lockInfo) {
-
- // We're making the lock timeout 30 minutes
- $lockInfo->timeout = 1800;
- $lockInfo->created = time();
- $lockInfo->uri = $uri;
-
- $locks = $this->getData();
-
- foreach ($locks as $k => $lock) {
- if (
- ($lock->token == $lockInfo->token) ||
- (time() > $lock->timeout + $lock->created)
- ) {
- unset($locks[$k]);
- }
- }
- $locks[] = $lockInfo;
- $this->putData($locks);
- return true;
-
- }
-
- /**
- * Removes a lock from a uri
- *
- * @param string $uri
- * @param LockInfo $lockInfo
- * @return bool
- */
- function unlock($uri, LockInfo $lockInfo) {
-
- $locks = $this->getData();
- foreach ($locks as $k => $lock) {
-
- if ($lock->token == $lockInfo->token) {
-
- unset($locks[$k]);
- $this->putData($locks);
- return true;
-
- }
- }
- return false;
-
- }
-
- protected $data = [];
-
- /**
- * Loads the lockdata from the filesystem.
- *
- * @return array
- */
- protected function getData() {
-
- return $this->data;
-
- }
-
- /**
- * Saves the lockdata
- *
- * @param array $newData
- * @return void
- */
- protected function putData(array $newData) {
-
- $this->data = $newData;
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php
deleted file mode 100644
index 0ba02fc8b53..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Locks\Backend;
-
-class PDOMySQLTest extends PDOTest {
-
- public $driver = 'mysql';
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOPgSqlTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOPgSqlTest.php
deleted file mode 100644
index 39ee56419a2..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOPgSqlTest.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Locks\Backend;
-
-class PDOPgSqlTest extends PDOTest {
-
- public $driver = 'pgsql';
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOSqliteTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOSqliteTest.php
deleted file mode 100644
index 4b126dcf359..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOSqliteTest.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Locks\Backend;
-
-class PDOSqliteTest extends PDOTest {
-
- public $driver = 'sqlite';
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOTest.php
deleted file mode 100644
index a27eae93cef..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOTest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Locks\Backend;
-
-abstract class PDOTest extends AbstractTest {
-
- use \Sabre\DAV\DbTestHelperTrait;
-
- function getBackend() {
-
- $this->dropTables('locks');
- $this->createSchema('locks');
-
- $pdo = $this->getPDO();
-
- return new PDO($pdo);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/MSWordTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/MSWordTest.php
deleted file mode 100644
index 1111db5b5c2..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/MSWordTest.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Locks;
-
-use Sabre\DAV;
-use Sabre\HTTP;
-
-require_once 'Sabre/HTTP/ResponseMock.php';
-require_once 'Sabre/TestUtil.php';
-
-class MSWordTest extends \PHPUnit_Framework_TestCase {
-
- function tearDown() {
-
- \Sabre\TestUtil::clearTempDir();
-
- }
-
- function testLockEtc() {
-
- mkdir(SABRE_TEMPDIR . '/mstest');
- $tree = new DAV\FS\Directory(SABRE_TEMPDIR . '/mstest');
-
- $server = new DAV\Server($tree);
- $server->debugExceptions = true;
- $locksBackend = new Backend\File(SABRE_TEMPDIR . '/locksdb');
- $locksPlugin = new Plugin($locksBackend);
- $server->addPlugin($locksPlugin);
-
- $response1 = new HTTP\ResponseMock();
-
- $server->httpRequest = $this->getLockRequest();
- $server->httpResponse = $response1;
- $server->sapi = new HTTP\SapiMock();
- $server->exec();
-
- $this->assertEquals(201, $server->httpResponse->getStatus(), 'Full response body:' . $response1->getBodyAsString());
- $this->assertTrue(!!$server->httpResponse->getHeaders('Lock-Token'));
- $lockToken = $server->httpResponse->getHeader('Lock-Token');
-
- //sleep(10);
-
- $response2 = new HTTP\ResponseMock();
-
- $server->httpRequest = $this->getLockRequest2();
- $server->httpResponse = $response2;
- $server->exec();
-
- $this->assertEquals(201, $server->httpResponse->status);
- $this->assertTrue(!!$server->httpResponse->getHeaders('Lock-Token'));
-
- //sleep(10);
-
- $response3 = new HTTP\ResponseMock();
- $server->httpRequest = $this->getPutRequest($lockToken);
- $server->httpResponse = $response3;
- $server->exec();
-
- $this->assertEquals(204, $server->httpResponse->status);
-
- }
-
- function getLockRequest() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'LOCK',
- 'HTTP_CONTENT_TYPE' => 'application/xml',
- 'HTTP_TIMEOUT' => 'Second-3600',
- 'REQUEST_URI' => '/Nouveau%20Microsoft%20Office%20Excel%20Worksheet.xlsx',
- ]);
-
- $request->setBody('<D:lockinfo xmlns:D="DAV:">
- <D:lockscope>
- <D:exclusive />
- </D:lockscope>
- <D:locktype>
- <D:write />
- </D:locktype>
- <D:owner>
- <D:href>PC-Vista\User</D:href>
- </D:owner>
-</D:lockinfo>');
-
- return $request;
-
- }
- function getLockRequest2() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'LOCK',
- 'HTTP_CONTENT_TYPE' => 'application/xml',
- 'HTTP_TIMEOUT' => 'Second-3600',
- 'REQUEST_URI' => '/~$Nouveau%20Microsoft%20Office%20Excel%20Worksheet.xlsx',
- ]);
-
- $request->setBody('<D:lockinfo xmlns:D="DAV:">
- <D:lockscope>
- <D:exclusive />
- </D:lockscope>
- <D:locktype>
- <D:write />
- </D:locktype>
- <D:owner>
- <D:href>PC-Vista\User</D:href>
- </D:owner>
-</D:lockinfo>');
-
- return $request;
-
- }
-
- function getPutRequest($lockToken) {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'PUT',
- 'REQUEST_URI' => '/Nouveau%20Microsoft%20Office%20Excel%20Worksheet.xlsx',
- 'HTTP_IF' => 'If: (' . $lockToken . ')',
- ]);
- $request->setBody('FAKE BODY');
- return $request;
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Plugin2Test.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Plugin2Test.php
deleted file mode 100644
index 7af49079574..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/Plugin2Test.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Locks;
-
-use Sabre\HTTP\Request;
-
-class Plugin2Test extends \Sabre\DAVServerTest {
-
- public $setupLocks = true;
-
- function setUpTree() {
-
- $this->tree = new \Sabre\DAV\FS\Directory(SABRE_TEMPDIR);
-
- }
-
- function tearDown() {
-
- \Sabre\TestUtil::clearTempDir();
-
- }
-
- /**
- * This test first creates a file with LOCK and then deletes it.
- *
- * After deleting the file, the lock should no longer be in the lock
- * backend.
- *
- * Reported in ticket #487
- */
- function testUnlockAfterDelete() {
-
- $body = '<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
-</D:lockinfo>';
-
- $request = new Request(
- 'LOCK',
- '/file.txt',
- [],
- $body
- );
- $response = $this->request($request);
- $this->assertEquals(201, $response->getStatus(), $response->getBodyAsString());
-
- $this->assertEquals(
- 1,
- count($this->locksBackend->getLocks('file.txt', true))
- );
-
- $request = new Request(
- 'DELETE',
- '/file.txt',
- [
- 'If' => '(' . $response->getHeader('Lock-Token') . ')',
- ]
- );
- $response = $this->request($request);
- $this->assertEquals(204, $response->getStatus(), $response->getBodyAsString());
-
- $this->assertEquals(
- 0,
- count($this->locksBackend->getLocks('file.txt', true))
- );
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/PluginTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/PluginTest.php
deleted file mode 100644
index dbbf6757aad..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Locks/PluginTest.php
+++ /dev/null
@@ -1,1003 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Locks;
-
-use Sabre\DAV;
-use Sabre\HTTP;
-
-require_once 'Sabre/DAV/AbstractServer.php';
-
-class PluginTest extends DAV\AbstractServer {
-
- /**
- * @var Plugin
- */
- protected $locksPlugin;
-
- function setUp() {
-
- parent::setUp();
- $locksBackend = new Backend\File(SABRE_TEMPDIR . '/locksdb');
- $locksPlugin = new Plugin($locksBackend);
- $this->server->addPlugin($locksPlugin);
- $this->locksPlugin = $locksPlugin;
-
- }
-
- function testGetInfo() {
-
- $this->assertArrayHasKey(
- 'name',
- $this->locksPlugin->getPluginInfo()
- );
-
- }
-
- function testGetFeatures() {
-
- $this->assertEquals([2], $this->locksPlugin->getFeatures());
-
- }
-
- function testGetHTTPMethods() {
-
- $this->assertEquals(['LOCK', 'UNLOCK'], $this->locksPlugin->getHTTPMethods(''));
-
- }
-
- function testLockNoBody() {
-
- $request = new HTTP\Request('LOCK', '/test.txt');
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ],
- $this->response->getHeaders()
- );
-
- $this->assertEquals(400, $this->response->status);
-
- }
-
- function testLock() {
-
- $request = new HTTP\Request('LOCK', '/test.txt');
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
- $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
-
- $this->assertEquals(200, $this->response->status, 'Got an incorrect status back. Response body: ' . $this->response->body);
-
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", "xmlns\\1=\"urn:DAV\"", $this->response->body);
- $xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d', 'urn:DAV');
-
- $elements = [
- '/d:prop',
- '/d:prop/d:lockdiscovery',
- '/d:prop/d:lockdiscovery/d:activelock',
- '/d:prop/d:lockdiscovery/d:activelock/d:locktype',
- '/d:prop/d:lockdiscovery/d:activelock/d:lockroot',
- '/d:prop/d:lockdiscovery/d:activelock/d:lockroot/d:href',
- '/d:prop/d:lockdiscovery/d:activelock/d:locktype/d:write',
- '/d:prop/d:lockdiscovery/d:activelock/d:lockscope',
- '/d:prop/d:lockdiscovery/d:activelock/d:lockscope/d:exclusive',
- '/d:prop/d:lockdiscovery/d:activelock/d:depth',
- '/d:prop/d:lockdiscovery/d:activelock/d:owner',
- '/d:prop/d:lockdiscovery/d:activelock/d:timeout',
- '/d:prop/d:lockdiscovery/d:activelock/d:locktoken',
- '/d:prop/d:lockdiscovery/d:activelock/d:locktoken/d:href',
- ];
-
- foreach ($elements as $elem) {
- $data = $xml->xpath($elem);
- $this->assertEquals(1, count($data), 'We expected 1 match for the xpath expression "' . $elem . '". ' . count($data) . ' were found. Full response body: ' . $this->response->body);
- }
-
- $depth = $xml->xpath('/d:prop/d:lockdiscovery/d:activelock/d:depth');
- $this->assertEquals('infinity', (string)$depth[0]);
-
- $token = $xml->xpath('/d:prop/d:lockdiscovery/d:activelock/d:locktoken/d:href');
- $this->assertEquals($this->response->getHeader('Lock-Token'), '<' . (string)$token[0] . '>', 'Token in response body didn\'t match token in response header.');
-
- }
-
- /**
- * @depends testLock
- */
- function testDoubleLock() {
-
- $request = new HTTP\Request('LOCK', '/test.txt');
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->response = new HTTP\ResponseMock();
- $this->server->httpResponse = $this->response;
-
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
-
- $this->assertEquals(423, $this->response->status, 'Full response: ' . $this->response->body);
-
- }
-
- /**
- * @depends testLock
- */
- function testLockRefresh() {
-
- $request = new HTTP\Request('LOCK', '/test.txt');
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $lockToken = $this->response->getHeader('Lock-Token');
-
- $this->response = new HTTP\ResponseMock();
- $this->server->httpResponse = $this->response;
-
- $request = new HTTP\Request('LOCK', '/test.txt', ['If' => '(' . $lockToken . ')']);
- $request->setBody('');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
-
- $this->assertEquals(200, $this->response->status, 'We received an incorrect status code. Full response body: ' . $this->response->getBody());
-
- }
-
- /**
- * @depends testLock
- */
- function testLockRefreshBadToken() {
-
- $request = new HTTP\Request('LOCK', '/test.txt');
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $lockToken = $this->response->getHeader('Lock-Token');
-
- $this->response = new HTTP\ResponseMock();
- $this->server->httpResponse = $this->response;
-
- $request = new HTTP\Request('LOCK', '/test.txt', ['If' => '(' . $lockToken . 'foobar) (<opaquelocktoken:anotherbadtoken>)']);
- $request->setBody('');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
-
- $this->assertEquals(423, $this->response->getStatus(), 'We received an incorrect status code. Full response body: ' . $this->response->getBody());
-
- }
-
- /**
- * @depends testLock
- */
- function testLockNoFile() {
-
- $request = new HTTP\Request('LOCK', '/notfound.txt');
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
- $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
-
- $this->assertEquals(201, $this->response->status);
-
- }
-
- /**
- * @depends testLock
- */
- function testUnlockNoToken() {
-
- $request = new HTTP\Request('UNLOCK', '/test.txt');
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ],
- $this->response->getHeaders()
- );
-
- $this->assertEquals(400, $this->response->status);
-
- }
-
- /**
- * @depends testLock
- */
- function testUnlockBadToken() {
-
- $request = new HTTP\Request('UNLOCK', '/test.txt', ['Lock-Token' => '<opaquelocktoken:blablabla>']);
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ],
- $this->response->getHeaders()
- );
-
- $this->assertEquals(409, $this->response->status, 'Got an incorrect status code. Full response body: ' . $this->response->body);
-
- }
-
- /**
- * @depends testLock
- */
- function testLockPutNoToken() {
-
- $request = new HTTP\Request('LOCK', '/test.txt');
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
- $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
-
- $this->assertEquals(200, $this->response->status);
-
- $request = new HTTP\Request('PUT', '/test.txt');
- $request->setBody('newbody');
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
- $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
-
- $this->assertEquals(423, $this->response->status);
-
- }
-
- /**
- * @depends testLock
- */
- function testUnlock() {
-
- $request = new HTTP\Request('LOCK', '/test.txt');
- $this->server->httpRequest = $request;
-
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->invokeMethod($request, $this->server->httpResponse);
- $lockToken = $this->server->httpResponse->getHeader('Lock-Token');
-
- $request = new HTTP\Request('UNLOCK', '/test.txt', ['Lock-Token' => $lockToken]);
- $this->server->httpRequest = $request;
- $this->server->httpResponse = new HTTP\ResponseMock();
- $this->server->invokeMethod($request, $this->server->httpResponse);
-
- $this->assertEquals(204, $this->server->httpResponse->status, 'Got an incorrect status code. Full response body: ' . $this->response->body);
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Length' => ['0'],
- ],
- $this->server->httpResponse->getHeaders()
- );
-
-
- }
-
- /**
- * @depends testLock
- */
- function testUnlockWindowsBug() {
-
- $request = new HTTP\Request('LOCK', '/test.txt');
- $this->server->httpRequest = $request;
-
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->invokeMethod($request, $this->server->httpResponse);
- $lockToken = $this->server->httpResponse->getHeader('Lock-Token');
-
- // See Issue 123
- $lockToken = trim($lockToken, '<>');
-
- $request = new HTTP\Request('UNLOCK', '/test.txt', ['Lock-Token' => $lockToken]);
- $this->server->httpRequest = $request;
- $this->server->httpResponse = new HTTP\ResponseMock();
- $this->server->invokeMethod($request, $this->server->httpResponse);
-
- $this->assertEquals(204, $this->server->httpResponse->status, 'Got an incorrect status code. Full response body: ' . $this->response->body);
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Length' => ['0'],
- ],
- $this->server->httpResponse->getHeaders()
- );
-
-
- }
-
- /**
- * @depends testLock
- */
- function testLockRetainOwner() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_URI' => '/test.txt',
- 'REQUEST_METHOD' => 'LOCK',
- ]);
- $this->server->httpRequest = $request;
-
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>Evert</D:owner>
-</D:lockinfo>');
-
- $this->server->invokeMethod($request, $this->server->httpResponse);
- $lockToken = $this->server->httpResponse->getHeader('Lock-Token');
-
- $locks = $this->locksPlugin->getLocks('test.txt');
- $this->assertEquals(1, count($locks));
- $this->assertEquals('Evert', $locks[0]->owner);
-
-
- }
-
- /**
- * @depends testLock
- */
- function testLockPutBadToken() {
-
- $serverVars = [
- 'REQUEST_URI' => '/test.txt',
- 'REQUEST_METHOD' => 'LOCK',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
- $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
-
- $this->assertEquals(200, $this->response->status);
-
- $serverVars = [
- 'REQUEST_URI' => '/test.txt',
- 'REQUEST_METHOD' => 'PUT',
- 'HTTP_IF' => '(<opaquelocktoken:token1>)',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('newbody');
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
- $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
-
- // $this->assertEquals('412 Precondition failed',$this->response->status);
- $this->assertEquals(423, $this->response->status);
-
- }
-
- /**
- * @depends testLock
- */
- function testLockDeleteParent() {
-
- $serverVars = [
- 'REQUEST_URI' => '/dir/child.txt',
- 'REQUEST_METHOD' => 'LOCK',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
- $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
-
- $this->assertEquals(200, $this->response->status);
-
- $serverVars = [
- 'REQUEST_URI' => '/dir',
- 'REQUEST_METHOD' => 'DELETE',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(423, $this->response->status);
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
-
- }
- /**
- * @depends testLock
- */
- function testLockDeleteSucceed() {
-
- $serverVars = [
- 'REQUEST_URI' => '/dir/child.txt',
- 'REQUEST_METHOD' => 'LOCK',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
- $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
-
- $this->assertEquals(200, $this->response->status);
-
- $serverVars = [
- 'REQUEST_URI' => '/dir/child.txt',
- 'REQUEST_METHOD' => 'DELETE',
- 'HTTP_IF' => '(' . $this->response->getHeader('Lock-Token') . ')',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(204, $this->response->status);
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
-
- }
-
- /**
- * @depends testLock
- */
- function testLockCopyLockSource() {
-
- $serverVars = [
- 'REQUEST_URI' => '/dir/child.txt',
- 'REQUEST_METHOD' => 'LOCK',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
- $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
-
- $this->assertEquals(200, $this->response->status);
-
- $serverVars = [
- 'REQUEST_URI' => '/dir/child.txt',
- 'REQUEST_METHOD' => 'COPY',
- 'HTTP_DESTINATION' => '/dir/child2.txt',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(201, $this->response->status, 'Copy must succeed if only the source is locked, but not the destination');
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
-
- }
- /**
- * @depends testLock
- */
- function testLockCopyLockDestination() {
-
- $serverVars = [
- 'REQUEST_URI' => '/dir/child2.txt',
- 'REQUEST_METHOD' => 'LOCK',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
- $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
-
- $this->assertEquals(201, $this->response->status);
-
- $serverVars = [
- 'REQUEST_URI' => '/dir/child.txt',
- 'REQUEST_METHOD' => 'COPY',
- 'HTTP_DESTINATION' => '/dir/child2.txt',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(423, $this->response->status, 'Copy must succeed if only the source is locked, but not the destination');
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
-
- }
-
- /**
- * @depends testLock
- */
- function testLockMoveLockSourceLocked() {
-
- $serverVars = [
- 'REQUEST_URI' => '/dir/child.txt',
- 'REQUEST_METHOD' => 'LOCK',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
- $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
-
- $this->assertEquals(200, $this->response->status);
-
- $serverVars = [
- 'REQUEST_URI' => '/dir/child.txt',
- 'REQUEST_METHOD' => 'MOVE',
- 'HTTP_DESTINATION' => '/dir/child2.txt',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(423, $this->response->status, 'Copy must succeed if only the source is locked, but not the destination');
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
-
- }
-
- /**
- * @depends testLock
- */
- function testLockMoveLockSourceSucceed() {
-
- $serverVars = [
- 'REQUEST_URI' => '/dir/child.txt',
- 'REQUEST_METHOD' => 'LOCK',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
- $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
-
- $this->assertEquals(200, $this->response->status);
-
- $serverVars = [
- 'REQUEST_URI' => '/dir/child.txt',
- 'REQUEST_METHOD' => 'MOVE',
- 'HTTP_DESTINATION' => '/dir/child2.txt',
- 'HTTP_IF' => '(' . $this->response->getHeader('Lock-Token') . ')',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(201, $this->response->status, 'A valid lock-token was provided for the source, so this MOVE operation must succeed. Full response body: ' . $this->response->body);
-
- }
-
- /**
- * @depends testLock
- */
- function testLockMoveLockDestination() {
-
- $serverVars = [
- 'REQUEST_URI' => '/dir/child2.txt',
- 'REQUEST_METHOD' => 'LOCK',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
- $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
-
- $this->assertEquals(201, $this->response->status);
-
- $serverVars = [
- 'REQUEST_URI' => '/dir/child.txt',
- 'REQUEST_METHOD' => 'MOVE',
- 'HTTP_DESTINATION' => '/dir/child2.txt',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(423, $this->response->status, 'Copy must succeed if only the source is locked, but not the destination');
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
-
- }
- /**
- * @depends testLock
- */
- function testLockMoveLockParent() {
-
- $serverVars = [
- 'REQUEST_URI' => '/dir',
- 'REQUEST_METHOD' => 'LOCK',
- 'HTTP_DEPTH' => 'infinite',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
- $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
-
- $this->assertEquals(200, $this->response->status);
-
- $serverVars = [
- 'REQUEST_URI' => '/dir/child.txt',
- 'REQUEST_METHOD' => 'MOVE',
- 'HTTP_DESTINATION' => '/dir/child2.txt',
- 'HTTP_IF' => '</dir> (' . $this->response->getHeader('Lock-Token') . ')',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(201, $this->response->status, 'We locked the parent of both the source and destination, but the move didn\'t succeed.');
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
-
- }
-
- /**
- * @depends testLock
- */
- function testLockPutGoodToken() {
-
- $serverVars = [
- 'REQUEST_URI' => '/test.txt',
- 'REQUEST_METHOD' => 'LOCK',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
- $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
-
- $this->assertEquals(200, $this->response->status);
-
- $serverVars = [
- 'REQUEST_URI' => '/test.txt',
- 'REQUEST_METHOD' => 'PUT',
- 'HTTP_IF' => '(' . $this->response->getHeader('Lock-Token') . ')',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('newbody');
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
- $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
-
- $this->assertEquals(204, $this->response->status);
-
- }
-
- /**
- * @depends testLock
- */
- function testLockPutUnrelatedToken() {
-
- $request = new HTTP\Request('LOCK', '/unrelated.txt');
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
- $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
-
- $this->assertEquals(201, $this->response->getStatus());
-
- $request = new HTTP\Request(
- 'PUT',
- '/test.txt',
- ['If' => '</unrelated.txt> (' . $this->response->getHeader('Lock-Token') . ')']
- );
- $request->setBody('newbody');
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
- $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
-
- $this->assertEquals(204, $this->response->status);
-
- }
-
- function testPutWithIncorrectETag() {
-
- $serverVars = [
- 'REQUEST_URI' => '/test.txt',
- 'REQUEST_METHOD' => 'PUT',
- 'HTTP_IF' => '(["etag1"])',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('newbody');
- $this->server->httpRequest = $request;
- $this->server->exec();
- $this->assertEquals(412, $this->response->status);
-
- }
-
- /**
- * @depends testPutWithIncorrectETag
- */
- function testPutWithCorrectETag() {
-
- // We need an ETag-enabled file node.
- $tree = new DAV\Tree(new DAV\FSExt\Directory(SABRE_TEMPDIR));
- $this->server->tree = $tree;
-
- $filename = SABRE_TEMPDIR . '/test.txt';
- $etag = sha1(
- fileinode($filename) .
- filesize($filename) .
- filemtime($filename)
- );
- $serverVars = [
- 'REQUEST_URI' => '/test.txt',
- 'REQUEST_METHOD' => 'PUT',
- 'HTTP_IF' => '(["' . $etag . '"])',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('newbody');
- $this->server->httpRequest = $request;
- $this->server->exec();
- $this->assertEquals(204, $this->response->status, 'Incorrect status received. Full response body:' . $this->response->body);
-
- }
-
- function testDeleteWithETagOnCollection() {
-
- $serverVars = [
- 'REQUEST_URI' => '/dir',
- 'REQUEST_METHOD' => 'DELETE',
- 'HTTP_IF' => '(["etag1"])',
- ];
- $request = HTTP\Sapi::createFromServerArray($serverVars);
-
- $this->server->httpRequest = $request;
- $this->server->exec();
- $this->assertEquals(412, $this->response->status);
-
- }
-
- function testGetTimeoutHeader() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'HTTP_TIMEOUT' => 'second-100',
- ]);
-
- $this->server->httpRequest = $request;
- $this->assertEquals(100, $this->locksPlugin->getTimeoutHeader());
-
- }
-
- function testGetTimeoutHeaderTwoItems() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'HTTP_TIMEOUT' => 'second-5, infinite',
- ]);
-
- $this->server->httpRequest = $request;
- $this->assertEquals(5, $this->locksPlugin->getTimeoutHeader());
-
- }
-
- function testGetTimeoutHeaderInfinite() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'HTTP_TIMEOUT' => 'infinite, second-5',
- ]);
-
- $this->server->httpRequest = $request;
- $this->assertEquals(LockInfo::TIMEOUT_INFINITE, $this->locksPlugin->getTimeoutHeader());
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\BadRequest
- */
- function testGetTimeoutHeaderInvalid() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'HTTP_TIMEOUT' => 'yourmom',
- ]);
-
- $this->server->httpRequest = $request;
- $this->locksPlugin->getTimeoutHeader();
-
- }
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Mock/Collection.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Mock/Collection.php
deleted file mode 100644
index fded5e474a6..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Mock/Collection.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Mock;
-
-use Sabre\DAV;
-
-/**
- * Mock Collection.
- *
- * This collection quickly allows you to create trees of nodes.
- * Children are specified as an array.
- *
- * Every key a filename, every array value is either:
- * * an array, for a sub-collection
- * * a string, for a file
- * * An instance of \Sabre\DAV\INode.
- *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Collection extends DAV\Collection {
-
- protected $name;
- protected $children;
- protected $parent;
-
- /**
- * Creates the object
- *
- * @param string $name
- * @param array $children
- * @param Collection $parent
- * @return void
- */
- function __construct($name, array $children = [], Collection $parent = null) {
-
- $this->name = $name;
- foreach ($children as $key => $value) {
- if (is_string($value)) {
- $this->children[] = new File($key, $value, $this);
- } elseif (is_array($value)) {
- $this->children[] = new self($key, $value, $this);
- } elseif ($value instanceof \Sabre\DAV\INode) {
- $this->children[] = $value;
- } else {
- throw new \InvalidArgumentException('Unknown value passed in $children');
- }
- }
- $this->parent = $parent;
-
- }
-
- /**
- * Returns the name of the node.
- *
- * This is used to generate the url.
- *
- * @return string
- */
- function getName() {
-
- return $this->name;
-
- }
-
- /**
- * Creates a new file in the directory
- *
- * Data will either be supplied as a stream resource, or in certain cases
- * as a string. Keep in mind that you may have to support either.
- *
- * After successful creation of the file, you may choose to return the ETag
- * of the new file here.
- *
- * The returned ETag must be surrounded by double-quotes (The quotes should
- * be part of the actual string).
- *
- * If you cannot accurately determine the ETag, you should not return it.
- * If you don't store the file exactly as-is (you're transforming it
- * somehow) you should also not return an ETag.
- *
- * This means that if a subsequent GET to this new file does not exactly
- * return the same contents of what was submitted here, you are strongly
- * recommended to omit the ETag.
- *
- * @param string $name Name of the file
- * @param resource|string $data Initial payload
- * @return null|string
- */
- function createFile($name, $data = null) {
-
- if (is_resource($data)) {
- $data = stream_get_contents($data);
- }
- $this->children[] = new File($name, $data, $this);
- return '"' . md5($data) . '"';
-
- }
-
- /**
- * Creates a new subdirectory
- *
- * @param string $name
- * @return void
- */
- function createDirectory($name) {
-
- $this->children[] = new self($name);
-
- }
-
- /**
- * Returns an array with all the child nodes
- *
- * @return \Sabre\DAV\INode[]
- */
- function getChildren() {
-
- return $this->children;
-
- }
-
- /**
- * Adds an already existing node to this collection.
- *
- * @param \Sabre\DAV\INode $node
- */
- function addNode(\Sabre\DAV\INode $node) {
-
- $this->children[] = $node;
-
- }
-
- /**
- * Removes a childnode from this node.
- *
- * @param string $name
- * @return void
- */
- function deleteChild($name) {
-
- foreach ($this->children as $key => $value) {
-
- if ($value->getName() == $name) {
- unset($this->children[$key]);
- return;
- }
-
- }
-
- }
-
- /**
- * Deletes this collection and all its children,.
- *
- * @return void
- */
- function delete() {
-
- foreach ($this->getChildren() as $child) {
- $this->deleteChild($child->getName());
- }
- $this->parent->deleteChild($this->getName());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Mock/File.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Mock/File.php
deleted file mode 100644
index a624b6b6bf1..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Mock/File.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Mock;
-
-use Sabre\DAV;
-
-/**
- * Mock File
- *
- * See the Collection in this directory for more details.
- *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class File extends DAV\File {
-
- protected $name;
- protected $contents;
- protected $parent;
- protected $lastModified;
-
- /**
- * Creates the object
- *
- * @param string $name
- * @param resource $contents
- * @param Collection $parent
- * @param int $lastModified
- * @return void
- */
- function __construct($name, $contents, Collection $parent = null, $lastModified = -1) {
-
- $this->name = $name;
- $this->put($contents);
- $this->parent = $parent;
-
- if ($lastModified === -1) {
- $lastModified = time();
- }
-
- $this->lastModified = $lastModified;
-
- }
-
- /**
- * Returns the name of the node.
- *
- * This is used to generate the url.
- *
- * @return string
- */
- function getName() {
-
- return $this->name;
-
- }
-
- /**
- * Changes the name of the node.
- *
- * @param string $name
- * @return void
- */
- function setName($name) {
-
- $this->name = $name;
-
- }
-
- /**
- * Updates the data
- *
- * The data argument is a readable stream resource.
- *
- * After a successful put operation, you may choose to return an ETag. The
- * etag must always be surrounded by double-quotes. These quotes must
- * appear in the actual string you're returning.
- *
- * Clients may use the ETag from a PUT request to later on make sure that
- * when they update the file, the contents haven't changed in the mean
- * time.
- *
- * If you don't plan to store the file byte-by-byte, and you return a
- * different object on a subsequent GET you are strongly recommended to not
- * return an ETag, and just return null.
- *
- * @param resource $data
- * @return string|null
- */
- function put($data) {
-
- if (is_resource($data)) {
- $data = stream_get_contents($data);
- }
- $this->contents = $data;
- return '"' . md5($data) . '"';
-
- }
-
- /**
- * Returns the data
- *
- * This method may either return a string or a readable stream resource
- *
- * @return mixed
- */
- function get() {
-
- return $this->contents;
-
- }
-
- /**
- * Returns the ETag for a file
- *
- * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
- *
- * Return null if the ETag can not effectively be determined
- *
- * @return void
- */
- function getETag() {
-
- return '"' . md5($this->contents) . '"';
-
- }
-
- /**
- * Returns the size of the node, in bytes
- *
- * @return int
- */
- function getSize() {
-
- return strlen($this->contents);
-
- }
-
- /**
- * Delete the node
- *
- * @return void
- */
- function delete() {
-
- $this->parent->deleteChild($this->name);
-
- }
-
- /**
- * Returns the last modification time as a unix timestamp.
- * If the information is not available, return null.
- *
- * @return int
- */
- function getLastModified() {
-
- return $this->lastModified;
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Mock/PropertiesCollection.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Mock/PropertiesCollection.php
deleted file mode 100644
index af3fd2d3f2f..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Mock/PropertiesCollection.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Mock;
-
-use Sabre\DAV\IProperties;
-use Sabre\DAV\PropPatch;
-
-/**
- * A node specifically for testing property-related operations
- *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class PropertiesCollection extends Collection implements IProperties {
-
- public $failMode = false;
-
- public $properties;
-
- /**
- * Creates the object
- *
- * @param string $name
- * @param array $children
- * @param array $properties
- * @return void
- */
- function __construct($name, array $children, array $properties = []) {
-
- parent::__construct($name, $children, null);
- $this->properties = $properties;
-
- }
-
- /**
- * Updates properties on this node.
- *
- * This method received a PropPatch object, which contains all the
- * information about the update.
- *
- * To update specific properties, call the 'handle' method on this object.
- * Read the PropPatch documentation for more information.
- *
- * @param PropPatch $proppatch
- * @return bool|array
- */
- function propPatch(PropPatch $proppatch) {
-
- $proppatch->handleRemaining(function($updateProperties) {
-
- switch ($this->failMode) {
- case 'updatepropsfalse' : return false;
- case 'updatepropsarray' :
- $r = [];
- foreach ($updateProperties as $k => $v) $r[$k] = 402;
- return $r;
- case 'updatepropsobj' :
- return new \STDClass();
- }
-
- });
-
- }
-
- /**
- * Returns a list of properties for this nodes.
- *
- * The properties list is a list of propertynames the client requested,
- * encoded in clark-notation {xmlnamespace}tagname
- *
- * If the array is empty, it means 'all properties' were requested.
- *
- * Note that it's fine to liberally give properties back, instead of
- * conforming to the list of requested properties.
- * The Server class will filter out the extra.
- *
- * @param array $requestedProperties
- * @return array
- */
- function getProperties($requestedProperties) {
-
- $returnedProperties = [];
- foreach ($requestedProperties as $requestedProperty) {
- if (isset($this->properties[$requestedProperty])) {
- $returnedProperties[$requestedProperty] =
- $this->properties[$requestedProperty];
- }
- }
- return $returnedProperties;
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Mock/SharedNode.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Mock/SharedNode.php
deleted file mode 100644
index 503d6407095..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Mock/SharedNode.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Mock;
-
-use Sabre\DAV\Sharing\ISharedNode;
-use Sabre\DAV\Sharing\Sharee;
-
-class SharedNode extends \Sabre\DAV\Node implements ISharedNode {
-
- protected $name;
- protected $access;
- protected $invites = [];
-
- function __construct($name, $access) {
-
- $this->name = $name;
- $this->access = $access;
-
- }
-
- function getName() {
-
- return $this->name;
-
- }
-
- /**
- * Returns the 'access level' for the instance of this shared resource.
- *
- * The value should be one of the Sabre\DAV\Sharing\Plugin::ACCESS_
- * constants.
- *
- * @return int
- */
- function getShareAccess() {
-
- return $this->access;
-
- }
-
- /**
- * This function must return a URI that uniquely identifies the shared
- * resource. This URI should be identical across instances, and is
- * also used in several other XML bodies to connect invites to
- * resources.
- *
- * This may simply be a relative reference to the original shared instance,
- * but it could also be a urn. As long as it's a valid URI and unique.
- *
- * @return string
- */
- function getShareResourceUri() {
-
- return 'urn:example:bar';
-
- }
-
- /**
- * Updates the list of sharees.
- *
- * Every item must be a Sharee object.
- *
- * @param Sharee[] $sharees
- * @return void
- */
- function updateInvites(array $sharees) {
-
- foreach ($sharees as $sharee) {
-
- if ($sharee->access === \Sabre\DAV\Sharing\Plugin::ACCESS_NOACCESS) {
- // Removal
- foreach ($this->invites as $k => $invitee) {
-
- if ($invitee->href = $sharee->href) {
- unset($this->invites[$k]);
- }
-
- }
-
- } else {
- foreach ($this->invites as $k => $invitee) {
-
- if ($invitee->href = $sharee->href) {
- if (!$sharee->inviteStatus) {
- $sharee->inviteStatus = $invitee->inviteStatus;
- }
- // Overwriting an existing invitee
- $this->invites[$k] = $sharee;
- continue 2;
- }
-
- }
- if (!$sharee->inviteStatus) {
- $sharee->inviteStatus = \Sabre\DAV\Sharing\Plugin::INVITE_NORESPONSE;
- }
- // Adding a new invitee
- $this->invites[] = $sharee;
- }
-
- }
-
- }
-
- /**
- * Returns the list of people whom this resource is shared with.
- *
- * Every item in the returned array must be a Sharee object with
- * at least the following properties set:
- *
- * * $href
- * * $shareAccess
- * * $inviteStatus
- *
- * and optionally:
- *
- * * $properties
- *
- * @return \Sabre\DAV\Xml\Element\Sharee[]
- */
- function getInvites() {
-
- return $this->invites;
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Mock/StreamingFile.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Mock/StreamingFile.php
deleted file mode 100644
index d60a49d092e..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Mock/StreamingFile.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Mock;
-
-/**
- * Mock Streaming File File
- *
- * Works similar to the mock file, but this one works with streams and has no
- * content-length or etags.
- *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class StreamingFile extends File {
-
- protected $size;
-
- /**
- * Updates the data
- *
- * The data argument is a readable stream resource.
- *
- * After a successful put operation, you may choose to return an ETag. The
- * etag must always be surrounded by double-quotes. These quotes must
- * appear in the actual string you're returning.
- *
- * Clients may use the ETag from a PUT request to later on make sure that
- * when they update the file, the contents haven't changed in the mean
- * time.
- *
- * If you don't plan to store the file byte-by-byte, and you return a
- * different object on a subsequent GET you are strongly recommended to not
- * return an ETag, and just return null.
- *
- * @param resource $data
- * @return string|null
- */
- function put($data) {
-
- if (is_string($data)) {
- $stream = fopen('php://memory', 'r+');
- fwrite($stream, $data);
- rewind($stream);
- $data = $stream;
- }
- $this->contents = $data;
-
- }
-
- /**
- * Returns the data
- *
- * This method may either return a string or a readable stream resource
- *
- * @return mixed
- */
- function get() {
-
- return $this->contents;
-
- }
-
- /**
- * Returns the ETag for a file
- *
- * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.
- *
- * Return null if the ETag can not effectively be determined
- *
- * @return void
- */
- function getETag() {
-
- return null;
-
- }
-
- /**
- * Returns the size of the node, in bytes
- *
- * @return int
- */
- function getSize() {
-
- return $this->size;
-
- }
-
- /**
- * Allows testing scripts to set the resource's file size.
- *
- * @param int $size
- * @return void
- */
- function setSize($size) {
-
- $this->size = $size;
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/MockLogger.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/MockLogger.php
deleted file mode 100644
index 03332569300..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/MockLogger.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Psr\Log\AbstractLogger;
-
-/**
- * The MockLogger is a simple PSR-3 implementation that we can use to test
- * whether things get logged correctly.
- *
- * @copyright Copyright (C) fruux GmbH. (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class MockLogger extends AbstractLogger {
-
- public $logs = [];
-
- /**
- * Logs with an arbitrary level.
- *
- * @param mixed $level
- * @param string $message
- * @param array $context
- * @return null
- */
- function log($level, $message, array $context = []) {
-
- $this->logs[] = [
- $level,
- $message,
- $context
- ];
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Mount/PluginTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Mount/PluginTest.php
deleted file mode 100644
index 3213fcb1b45..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Mount/PluginTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Mount;
-
-use Sabre\DAV;
-use Sabre\HTTP;
-
-require_once 'Sabre/DAV/AbstractServer.php';
-
-class PluginTest extends DAV\AbstractServer {
-
- function setUp() {
-
- parent::setUp();
- $this->server->addPlugin(new Plugin());
-
- }
-
- function testPassThrough() {
-
- $serverVars = [
- 'REQUEST_URI' => '/',
- 'REQUEST_METHOD' => 'GET',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals(501, $this->response->status, 'We expected GET to not be implemented for Directories. Response body: ' . $this->response->body);
-
- }
-
- function testMountResponse() {
-
- $serverVars = [
- 'REQUEST_URI' => '/?mount',
- 'REQUEST_METHOD' => 'GET',
- 'QUERY_STRING' => 'mount',
- 'HTTP_HOST' => 'example.org',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals(200, $this->response->status);
-
- $xml = simplexml_load_string($this->response->body);
- $this->assertInstanceOf('SimpleXMLElement', $xml, 'Response was not a valid xml document. The list of errors:' . print_r(libxml_get_errors(), true) . '. xml body: ' . $this->response->body . '. What type we got: ' . gettype($xml) . ' class, if object: ' . get_class($xml));
-
- $xml->registerXPathNamespace('dm', 'http://purl.org/NET/webdav/mount');
- $url = $xml->xpath('//dm:url');
- $this->assertEquals('http://example.org/', (string)$url[0]);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ObjectTreeTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ObjectTreeTest.php
deleted file mode 100644
index 15289ce528c..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ObjectTreeTest.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-require_once 'Sabre/TestUtil.php';
-
-class ObjectTreeTest extends \PHPUnit_Framework_TestCase {
-
- protected $tree;
-
- function setup() {
-
- \Sabre\TestUtil::clearTempDir();
- mkdir(SABRE_TEMPDIR . '/root');
- mkdir(SABRE_TEMPDIR . '/root/subdir');
- file_put_contents(SABRE_TEMPDIR . '/root/file.txt', 'contents');
- file_put_contents(SABRE_TEMPDIR . '/root/subdir/subfile.txt', 'subcontents');
- $rootNode = new FSExt\Directory(SABRE_TEMPDIR . '/root');
- $this->tree = new Tree($rootNode);
-
- }
-
- function teardown() {
-
- \Sabre\TestUtil::clearTempDir();
-
- }
-
- function testGetRootNode() {
-
- $root = $this->tree->getNodeForPath('');
- $this->assertInstanceOf('Sabre\\DAV\\FSExt\\Directory', $root);
-
- }
-
- function testGetSubDir() {
-
- $root = $this->tree->getNodeForPath('subdir');
- $this->assertInstanceOf('Sabre\\DAV\\FSExt\\Directory', $root);
-
- }
-
- function testCopyFile() {
-
- $this->tree->copy('file.txt', 'file2.txt');
- $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/file2.txt'));
- $this->assertEquals('contents', file_get_contents(SABRE_TEMPDIR . '/root/file2.txt'));
-
- }
-
- /**
- * @depends testCopyFile
- */
- function testCopyDirectory() {
-
- $this->tree->copy('subdir', 'subdir2');
- $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/subdir2'));
- $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/subdir2/subfile.txt'));
- $this->assertEquals('subcontents', file_get_contents(SABRE_TEMPDIR . '/root/subdir2/subfile.txt'));
-
- }
-
- /**
- * @depends testCopyFile
- */
- function testMoveFile() {
-
- $this->tree->move('file.txt', 'file2.txt');
- $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/file2.txt'));
- $this->assertFalse(file_exists(SABRE_TEMPDIR . '/root/file.txt'));
- $this->assertEquals('contents', file_get_contents(SABRE_TEMPDIR . '/root/file2.txt'));
-
- }
-
- /**
- * @depends testMoveFile
- */
- function testMoveFileNewParent() {
-
- $this->tree->move('file.txt', 'subdir/file2.txt');
- $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/subdir/file2.txt'));
- $this->assertFalse(file_exists(SABRE_TEMPDIR . '/root/file.txt'));
- $this->assertEquals('contents', file_get_contents(SABRE_TEMPDIR . '/root/subdir/file2.txt'));
-
- }
-
- /**
- * @depends testCopyDirectory
- */
- function testMoveDirectory() {
-
- $this->tree->move('subdir', 'subdir2');
- $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/subdir2'));
- $this->assertTrue(file_exists(SABRE_TEMPDIR . '/root/subdir2/subfile.txt'));
- $this->assertFalse(file_exists(SABRE_TEMPDIR . '/root/subdir'));
- $this->assertEquals('subcontents', file_get_contents(SABRE_TEMPDIR . '/root/subdir2/subfile.txt'));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PSR3Test.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PSR3Test.php
deleted file mode 100644
index d30fde128a7..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PSR3Test.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-class PSR3Test extends \PHPUnit_Framework_TestCase {
-
- function testIsLoggerAware() {
-
- $server = new Server();
- $this->assertInstanceOf(
- 'Psr\Log\LoggerAwareInterface',
- $server
- );
-
- }
-
- function testGetNullLoggerByDefault() {
-
- $server = new Server();
- $this->assertInstanceOf(
- 'Psr\Log\NullLogger',
- $server->getLogger()
- );
-
- }
-
- function testSetLogger() {
-
- $server = new Server();
- $logger = new MockLogger();
-
- $server->setLogger($logger);
-
- $this->assertEquals(
- $logger,
- $server->getLogger()
- );
-
- }
-
- /**
- * Start the server, trigger an exception and see if the logger captured
- * it.
- */
- function testLogException() {
-
- $server = new Server();
- $logger = new MockLogger();
-
- $server->setLogger($logger);
-
- // Creating a fake environment to execute http requests in.
- $request = new \Sabre\HTTP\Request(
- 'GET',
- '/not-found',
- []
- );
- $response = new \Sabre\HTTP\Response();
-
- $server->httpRequest = $request;
- $server->httpResponse = $response;
- $server->sapi = new \Sabre\HTTP\SapiMock();
-
- // Executing the request.
- $server->exec();
-
- // The request should have triggered a 404 status.
- $this->assertEquals(404, $response->getStatus());
-
- // We should also see this in the PSR-3 log.
- $this->assertEquals(1, count($logger->logs));
-
- $logItem = $logger->logs[0];
-
- $this->assertEquals(
- \Psr\Log\LogLevel::INFO,
- $logItem[0]
- );
-
- $this->assertInstanceOf(
- 'Exception',
- $logItem[2]['exception']
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PartialUpdate/FileMock.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PartialUpdate/FileMock.php
deleted file mode 100644
index eff1e7d6738..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PartialUpdate/FileMock.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-namespace Sabre\DAV\PartialUpdate;
-
-use Sabre\DAV;
-
-class FileMock implements IPatchSupport {
-
- protected $data = '';
-
- function put($str) {
-
- if (is_resource($str)) {
- $str = stream_get_contents($str);
- }
- $this->data = $str;
-
- }
-
- /**
- * Updates the file based on a range specification.
- *
- * The first argument is the data, which is either a readable stream
- * resource or a string.
- *
- * The second argument is the type of update we're doing.
- * This is either:
- * * 1. append
- * * 2. update based on a start byte
- * * 3. update based on an end byte
- *;
- * The third argument is the start or end byte.
- *
- * After a successful put operation, you may choose to return an ETag. The
- * etag must always be surrounded by double-quotes. These quotes must
- * appear in the actual string you're returning.
- *
- * Clients may use the ETag from a PUT request to later on make sure that
- * when they update the file, the contents haven't changed in the mean
- * time.
- *
- * @param resource|string $data
- * @param int $rangeType
- * @param int $offset
- * @return string|null
- */
- function patch($data, $rangeType, $offset = null) {
-
- if (is_resource($data)) {
- $data = stream_get_contents($data);
- }
-
- switch ($rangeType) {
-
- case 1 :
- $this->data .= $data;
- break;
- case 3 :
- // Turn the offset into an offset-offset.
- $offset = strlen($this->data) - $offset;
- // No break is intentional
- case 2 :
- $this->data =
- substr($this->data, 0, $offset) .
- $data .
- substr($this->data, $offset + strlen($data));
- break;
-
- }
-
- }
-
- function get() {
-
- return $this->data;
-
- }
-
- function getContentType() {
-
- return 'text/plain';
-
- }
-
- function getSize() {
-
- return strlen($this->data);
-
- }
-
- function getETag() {
-
- return '"' . $this->data . '"';
-
- }
-
- function delete() {
-
- throw new DAV\Exception\MethodNotAllowed();
-
- }
-
- function setName($name) {
-
- throw new DAV\Exception\MethodNotAllowed();
-
- }
-
- function getName() {
-
- return 'partial';
-
- }
-
- function getLastModified() {
-
- return null;
-
- }
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PartialUpdate/PluginTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PartialUpdate/PluginTest.php
deleted file mode 100644
index 5bd696416bb..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PartialUpdate/PluginTest.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-namespace Sabre\DAV\PartialUpdate;
-
-use Sabre\DAV;
-use Sabre\HTTP;
-
-require_once 'Sabre/DAV/PartialUpdate/FileMock.php';
-
-class PluginTest extends \Sabre\DAVServerTest {
-
- protected $node;
- protected $plugin;
-
- function setUp() {
-
- $this->node = new FileMock();
- $this->tree[] = $this->node;
-
- parent::setUp();
-
- $this->plugin = new Plugin();
- $this->server->addPlugin($this->plugin);
-
-
-
- }
-
- function testInit() {
-
- $this->assertEquals('partialupdate', $this->plugin->getPluginName());
- $this->assertEquals(['sabredav-partialupdate'], $this->plugin->getFeatures());
- $this->assertEquals([
- 'PATCH'
- ], $this->plugin->getHTTPMethods('partial'));
- $this->assertEquals([
- ], $this->plugin->getHTTPMethods(''));
-
- }
-
- function testPatchNoRange() {
-
- $this->node->put('aaaaaaaa');
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'PATCH',
- 'REQUEST_URI' => '/partial',
- ]);
- $response = $this->request($request);
-
- $this->assertEquals(400, $response->status, 'Full response body:' . $response->body);
-
- }
-
- function testPatchNotSupported() {
-
- $this->node->put('aaaaaaaa');
- $request = new HTTP\Request('PATCH', '/', ['X-Update-Range' => '3-4']);
- $request->setBody(
- 'bbb'
- );
- $response = $this->request($request);
-
- $this->assertEquals(405, $response->status, 'Full response body:' . $response->body);
-
- }
-
- function testPatchNoContentType() {
-
- $this->node->put('aaaaaaaa');
- $request = new HTTP\Request('PATCH', '/partial', ['X-Update-Range' => 'bytes=3-4']);
- $request->setBody(
- 'bbb'
- );
- $response = $this->request($request);
-
- $this->assertEquals(415, $response->status, 'Full response body:' . $response->body);
-
- }
-
- function testPatchBadRange() {
-
- $this->node->put('aaaaaaaa');
- $request = new HTTP\Request('PATCH', '/partial', ['X-Update-Range' => 'bytes=3-4', 'Content-Type' => 'application/x-sabredav-partialupdate', 'Content-Length' => '3']);
- $request->setBody(
- 'bbb'
- );
- $response = $this->request($request);
-
- $this->assertEquals(416, $response->status, 'Full response body:' . $response->body);
-
- }
-
- function testPatchNoLength() {
-
- $this->node->put('aaaaaaaa');
- $request = new HTTP\Request('PATCH', '/partial', ['X-Update-Range' => 'bytes=3-5', 'Content-Type' => 'application/x-sabredav-partialupdate']);
- $request->setBody(
- 'bbb'
- );
- $response = $this->request($request);
-
- $this->assertEquals(411, $response->status, 'Full response body:' . $response->body);
-
- }
-
- function testPatchSuccess() {
-
- $this->node->put('aaaaaaaa');
- $request = new HTTP\Request('PATCH', '/partial', ['X-Update-Range' => 'bytes=3-5', 'Content-Type' => 'application/x-sabredav-partialupdate', 'Content-Length' => 3]);
- $request->setBody(
- 'bbb'
- );
- $response = $this->request($request);
-
- $this->assertEquals(204, $response->status, 'Full response body:' . $response->body);
- $this->assertEquals('aaabbbaa', $this->node->get());
-
- }
-
- function testPatchNoEndRange() {
-
- $this->node->put('aaaaa');
- $request = new HTTP\Request('PATCH', '/partial', ['X-Update-Range' => 'bytes=3-', 'Content-Type' => 'application/x-sabredav-partialupdate', 'Content-Length' => '3']);
- $request->setBody(
- 'bbb'
- );
-
- $response = $this->request($request);
-
- $this->assertEquals(204, $response->getStatus(), 'Full response body:' . $response->getBodyAsString());
- $this->assertEquals('aaabbb', $this->node->get());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php
deleted file mode 100644
index 2c627417330..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PartialUpdate/SpecificationTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace Sabre\DAV\PartialUpdate;
-
-use Sabre\DAV\FSExt\File;
-use Sabre\DAV\Server;
-use Sabre\HTTP;
-
-/**
- * This test is an end-to-end sabredav test that goes through all
- * the cases in the specification.
- *
- * See: http://sabre.io/dav/http-patch/
- */
-class SpecificationTest extends \PHPUnit_Framework_TestCase {
-
- protected $server;
-
- function setUp() {
-
- $tree = [
- new File(SABRE_TEMPDIR . '/foobar.txt')
- ];
- $server = new Server($tree);
- $server->debugExceptions = true;
- $server->addPlugin(new Plugin());
-
- $tree[0]->put('1234567890');
-
- $this->server = $server;
-
- }
-
- function tearDown() {
-
- \Sabre\TestUtil::clearTempDir();
-
- }
-
- /**
- * @param string $headerValue
- * @param string $httpStatus
- * @param string $endResult
- * @param int $contentLength
- *
- * @dataProvider data
- */
- function testUpdateRange($headerValue, $httpStatus, $endResult, $contentLength = 4) {
-
- $headers = [
- 'Content-Type' => 'application/x-sabredav-partialupdate',
- 'X-Update-Range' => $headerValue,
- ];
-
- if ($contentLength) {
- $headers['Content-Length'] = (string)$contentLength;
- }
-
- $request = new HTTP\Request('PATCH', '/foobar.txt', $headers, '----');
-
- $request->setBody('----');
- $this->server->httpRequest = $request;
- $this->server->httpResponse = new HTTP\ResponseMock();
- $this->server->sapi = new HTTP\SapiMock();
- $this->server->exec();
-
- $this->assertEquals($httpStatus, $this->server->httpResponse->status, 'Incorrect http status received: ' . $this->server->httpResponse->body);
- if (!is_null($endResult)) {
- $this->assertEquals($endResult, file_get_contents(SABRE_TEMPDIR . '/foobar.txt'));
- }
-
- }
-
- function data() {
-
- return [
- // Problems
- ['foo', 400, null],
- ['bytes=0-3', 411, null, 0],
- ['bytes=4-1', 416, null],
-
- ['bytes=0-3', 204, '----567890'],
- ['bytes=1-4', 204, '1----67890'],
- ['bytes=0-', 204, '----567890'],
- ['bytes=-4', 204, '123456----'],
- ['bytes=-2', 204, '12345678----'],
- ['bytes=2-', 204, '12----7890'],
- ['append', 204, '1234567890----'],
-
- ];
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropFindTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropFindTest.php
deleted file mode 100644
index ec1d616cbb9..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropFindTest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-class PropFindTest extends \PHPUnit_Framework_TestCase {
-
- function testHandle() {
-
- $propFind = new PropFind('foo', ['{DAV:}displayname']);
- $propFind->handle('{DAV:}displayname', 'foobar');
-
- $this->assertEquals([
- 200 => ['{DAV:}displayname' => 'foobar'],
- 404 => [],
- ], $propFind->getResultForMultiStatus());
-
- }
-
- function testHandleCallBack() {
-
- $propFind = new PropFind('foo', ['{DAV:}displayname']);
- $propFind->handle('{DAV:}displayname', function() { return 'foobar'; });
-
- $this->assertEquals([
- 200 => ['{DAV:}displayname' => 'foobar'],
- 404 => [],
- ], $propFind->getResultForMultiStatus());
-
- }
-
- function testAllPropDefaults() {
-
- $propFind = new PropFind('foo', ['{DAV:}displayname'], 0, PropFind::ALLPROPS);
-
- $this->assertEquals([
- 200 => [],
- ], $propFind->getResultForMultiStatus());
-
- }
-
- function testSet() {
-
- $propFind = new PropFind('foo', ['{DAV:}displayname']);
- $propFind->set('{DAV:}displayname', 'bar');
-
- $this->assertEquals([
- 200 => ['{DAV:}displayname' => 'bar'],
- 404 => [],
- ], $propFind->getResultForMultiStatus());
-
- }
-
- function testSetAllpropCustom() {
-
- $propFind = new PropFind('foo', ['{DAV:}displayname'], 0, PropFind::ALLPROPS);
- $propFind->set('{DAV:}customproperty', 'bar');
-
- $this->assertEquals([
- 200 => ['{DAV:}customproperty' => 'bar'],
- ], $propFind->getResultForMultiStatus());
-
- }
-
- function testSetUnset() {
-
- $propFind = new PropFind('foo', ['{DAV:}displayname']);
- $propFind->set('{DAV:}displayname', 'bar');
- $propFind->set('{DAV:}displayname', null);
-
- $this->assertEquals([
- 200 => [],
- 404 => ['{DAV:}displayname' => null],
- ], $propFind->getResultForMultiStatus());
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropPatchTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropPatchTest.php
deleted file mode 100644
index 72dbf5345b5..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropPatchTest.php
+++ /dev/null
@@ -1,351 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-class PropPatchTest extends \PHPUnit_Framework_TestCase {
-
- protected $propPatch;
-
- function setUp() {
-
- $this->propPatch = new PropPatch([
- '{DAV:}displayname' => 'foo',
- ]);
- $this->assertEquals(['{DAV:}displayname' => 'foo'], $this->propPatch->getMutations());
-
- }
-
- function testHandleSingleSuccess() {
-
- $hasRan = false;
-
- $this->propPatch->handle('{DAV:}displayname', function($value) use (&$hasRan) {
- $hasRan = true;
- $this->assertEquals('foo', $value);
- return true;
- });
-
- $this->assertTrue($this->propPatch->commit());
- $result = $this->propPatch->getResult();
- $this->assertEquals(['{DAV:}displayname' => 200], $result);
-
- $this->assertTrue($hasRan);
-
- }
-
- function testHandleSingleFail() {
-
- $hasRan = false;
-
- $this->propPatch->handle('{DAV:}displayname', function($value) use (&$hasRan) {
- $hasRan = true;
- $this->assertEquals('foo', $value);
- return false;
- });
-
- $this->assertFalse($this->propPatch->commit());
- $result = $this->propPatch->getResult();
- $this->assertEquals(['{DAV:}displayname' => 403], $result);
-
- $this->assertTrue($hasRan);
-
- }
-
- function testHandleSingleCustomResult() {
-
- $hasRan = false;
-
- $this->propPatch->handle('{DAV:}displayname', function($value) use (&$hasRan) {
- $hasRan = true;
- $this->assertEquals('foo', $value);
- return 201;
- });
-
- $this->assertTrue($this->propPatch->commit());
- $result = $this->propPatch->getResult();
- $this->assertEquals(['{DAV:}displayname' => 201], $result);
-
- $this->assertTrue($hasRan);
-
- }
-
- function testHandleSingleDeleteSuccess() {
-
- $hasRan = false;
-
- $this->propPatch = new PropPatch(['{DAV:}displayname' => null]);
- $this->propPatch->handle('{DAV:}displayname', function($value) use (&$hasRan) {
- $hasRan = true;
- $this->assertNull($value);
- return true;
- });
-
- $this->assertTrue($this->propPatch->commit());
- $result = $this->propPatch->getResult();
- $this->assertEquals(['{DAV:}displayname' => 204], $result);
-
- $this->assertTrue($hasRan);
-
- }
-
-
- function testHandleNothing() {
-
- $hasRan = false;
-
- $this->propPatch->handle('{DAV:}foobar', function($value) use (&$hasRan) {
- $hasRan = true;
- });
-
- $this->assertFalse($hasRan);
-
- }
-
- /**
- * @depends testHandleSingleSuccess
- */
- function testHandleRemaining() {
-
- $hasRan = false;
-
- $this->propPatch->handleRemaining(function($mutations) use (&$hasRan) {
- $hasRan = true;
- $this->assertEquals(['{DAV:}displayname' => 'foo'], $mutations);
- return true;
- });
-
- $this->assertTrue($this->propPatch->commit());
- $result = $this->propPatch->getResult();
- $this->assertEquals(['{DAV:}displayname' => 200], $result);
-
- $this->assertTrue($hasRan);
-
- }
- function testHandleRemainingNothingToDo() {
-
- $hasRan = false;
-
- $this->propPatch->handle('{DAV:}displayname', function() {});
- $this->propPatch->handleRemaining(function($mutations) use (&$hasRan) {
- $hasRan = true;
- });
-
- $this->assertFalse($hasRan);
-
- }
-
- function testSetResultCode() {
-
- $this->propPatch->setResultCode('{DAV:}displayname', 201);
- $this->assertTrue($this->propPatch->commit());
- $result = $this->propPatch->getResult();
- $this->assertEquals(['{DAV:}displayname' => 201], $result);
-
- }
-
- function testSetResultCodeFail() {
-
- $this->propPatch->setResultCode('{DAV:}displayname', 402);
- $this->assertFalse($this->propPatch->commit());
- $result = $this->propPatch->getResult();
- $this->assertEquals(['{DAV:}displayname' => 402], $result);
-
- }
-
- function testSetRemainingResultCode() {
-
- $this->propPatch->setRemainingResultCode(204);
- $this->assertTrue($this->propPatch->commit());
- $result = $this->propPatch->getResult();
- $this->assertEquals(['{DAV:}displayname' => 204], $result);
-
- }
-
- function testCommitNoHandler() {
-
- $this->assertFalse($this->propPatch->commit());
- $result = $this->propPatch->getResult();
- $this->assertEquals(['{DAV:}displayname' => 403], $result);
-
- }
-
- function testHandlerNotCalled() {
-
- $hasRan = false;
-
- $this->propPatch->setResultCode('{DAV:}displayname', 402);
- $this->propPatch->handle('{DAV:}displayname', function($value) use (&$hasRan) {
- $hasRan = true;
- });
-
- $this->propPatch->commit();
-
- // The handler is not supposed to have ran
- $this->assertFalse($hasRan);
-
- }
-
- function testDependencyFail() {
-
- $propPatch = new PropPatch([
- '{DAV:}a' => 'foo',
- '{DAV:}b' => 'bar',
- ]);
-
- $calledA = false;
- $calledB = false;
-
- $propPatch->handle('{DAV:}a', function() use (&$calledA) {
- $calledA = true;
- return false;
- });
- $propPatch->handle('{DAV:}b', function() use (&$calledB) {
- $calledB = true;
- return false;
- });
-
- $result = $propPatch->commit();
- $this->assertTrue($calledA);
- $this->assertFalse($calledB);
-
- $this->assertFalse($result);
-
- $this->assertEquals([
- '{DAV:}a' => 403,
- '{DAV:}b' => 424,
- ], $propPatch->getResult());
-
- }
-
- /**
- * @expectedException \UnexpectedValueException
- */
- function testHandleSingleBrokenResult() {
-
- $propPatch = new PropPatch([
- '{DAV:}a' => 'foo',
- ]);
-
- $propPatch->handle('{DAV:}a', function() {
- return [];
- });
- $propPatch->commit();
-
- }
-
- function testHandleMultiValueSuccess() {
-
- $propPatch = new PropPatch([
- '{DAV:}a' => 'foo',
- '{DAV:}b' => 'bar',
- '{DAV:}c' => null,
- ]);
-
- $calledA = false;
-
- $propPatch->handle(['{DAV:}a', '{DAV:}b', '{DAV:}c'], function($properties) use (&$calledA) {
- $calledA = true;
- $this->assertEquals([
- '{DAV:}a' => 'foo',
- '{DAV:}b' => 'bar',
- '{DAV:}c' => null,
- ], $properties);
- return true;
- });
- $result = $propPatch->commit();
- $this->assertTrue($calledA);
- $this->assertTrue($result);
-
- $this->assertEquals([
- '{DAV:}a' => 200,
- '{DAV:}b' => 200,
- '{DAV:}c' => 204,
- ], $propPatch->getResult());
-
- }
-
-
- function testHandleMultiValueFail() {
-
- $propPatch = new PropPatch([
- '{DAV:}a' => 'foo',
- '{DAV:}b' => 'bar',
- '{DAV:}c' => null,
- ]);
-
- $calledA = false;
-
- $propPatch->handle(['{DAV:}a', '{DAV:}b', '{DAV:}c'], function($properties) use (&$calledA) {
- $calledA = true;
- $this->assertEquals([
- '{DAV:}a' => 'foo',
- '{DAV:}b' => 'bar',
- '{DAV:}c' => null,
- ], $properties);
- return false;
- });
- $result = $propPatch->commit();
- $this->assertTrue($calledA);
- $this->assertFalse($result);
-
- $this->assertEquals([
- '{DAV:}a' => 403,
- '{DAV:}b' => 403,
- '{DAV:}c' => 403,
- ], $propPatch->getResult());
-
- }
-
- function testHandleMultiValueCustomResult() {
-
- $propPatch = new PropPatch([
- '{DAV:}a' => 'foo',
- '{DAV:}b' => 'bar',
- '{DAV:}c' => null,
- ]);
-
- $calledA = false;
-
- $propPatch->handle(['{DAV:}a', '{DAV:}b', '{DAV:}c'], function($properties) use (&$calledA) {
- $calledA = true;
- $this->assertEquals([
- '{DAV:}a' => 'foo',
- '{DAV:}b' => 'bar',
- '{DAV:}c' => null,
- ], $properties);
-
- return [
- '{DAV:}a' => 201,
- '{DAV:}b' => 204,
- ];
- });
- $result = $propPatch->commit();
- $this->assertTrue($calledA);
- $this->assertFalse($result);
-
- $this->assertEquals([
- '{DAV:}a' => 201,
- '{DAV:}b' => 204,
- '{DAV:}c' => 500,
- ], $propPatch->getResult());
-
- }
-
- /**
- * @expectedException \UnexpectedValueException
- */
- function testHandleMultiValueBroken() {
-
- $propPatch = new PropPatch([
- '{DAV:}a' => 'foo',
- '{DAV:}b' => 'bar',
- '{DAV:}c' => null,
- ]);
-
- $propPatch->handle(['{DAV:}a', '{DAV:}b', '{DAV:}c'], function($properties) {
- return 'hi';
- });
- $propPatch->commit();
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropertyStorage/Backend/AbstractPDOTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropertyStorage/Backend/AbstractPDOTest.php
deleted file mode 100644
index a2b9987b7e5..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropertyStorage/Backend/AbstractPDOTest.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php
-
-namespace Sabre\DAV\PropertyStorage\Backend;
-
-use Sabre\DAV\PropFind;
-use Sabre\DAV\PropPatch;
-use Sabre\DAV\Xml\Property\Complex;
-use Sabre\DAV\Xml\Property\Href;
-
-abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
-
- use \Sabre\DAV\DbTestHelperTrait;
-
- function getBackend() {
-
- $this->dropTables('propertystorage');
- $this->createSchema('propertystorage');
-
- $pdo = $this->getPDO();
-
- $pdo->exec("INSERT INTO propertystorage (path, name, valuetype, value) VALUES ('dir', '{DAV:}displayname', 1, 'Directory')");
-
- return new PDO($this->getPDO());
-
- }
-
- function testPropFind() {
-
- $backend = $this->getBackend();
-
- $propFind = new PropFind('dir', ['{DAV:}displayname']);
- $backend->propFind('dir', $propFind);
-
- $this->assertEquals('Directory', $propFind->get('{DAV:}displayname'));
-
- }
-
- function testPropFindNothingToDo() {
-
- $backend = $this->getBackend();
-
- $propFind = new PropFind('dir', ['{DAV:}displayname']);
- $propFind->set('{DAV:}displayname', 'foo');
- $backend->propFind('dir', $propFind);
-
- $this->assertEquals('foo', $propFind->get('{DAV:}displayname'));
-
- }
-
- /**
- * @depends testPropFind
- */
- function testPropPatchUpdate() {
-
- $backend = $this->getBackend();
-
- $propPatch = new PropPatch(['{DAV:}displayname' => 'bar']);
- $backend->propPatch('dir', $propPatch);
- $propPatch->commit();
-
- $propFind = new PropFind('dir', ['{DAV:}displayname']);
- $backend->propFind('dir', $propFind);
-
- $this->assertEquals('bar', $propFind->get('{DAV:}displayname'));
-
- }
-
- /**
- * @depends testPropPatchUpdate
- */
- function testPropPatchComplex() {
-
- $backend = $this->getBackend();
-
- $complex = new Complex('<foo xmlns="DAV:">somevalue</foo>');
-
- $propPatch = new PropPatch(['{DAV:}complex' => $complex]);
- $backend->propPatch('dir', $propPatch);
- $propPatch->commit();
-
- $propFind = new PropFind('dir', ['{DAV:}complex']);
- $backend->propFind('dir', $propFind);
-
- $this->assertEquals($complex, $propFind->get('{DAV:}complex'));
-
- }
-
-
- /**
- * @depends testPropPatchComplex
- */
- function testPropPatchCustom() {
-
- $backend = $this->getBackend();
-
- $custom = new Href('/foo/bar/');
-
- $propPatch = new PropPatch(['{DAV:}custom' => $custom]);
- $backend->propPatch('dir', $propPatch);
- $propPatch->commit();
-
- $propFind = new PropFind('dir', ['{DAV:}custom']);
- $backend->propFind('dir', $propFind);
-
- $this->assertEquals($custom, $propFind->get('{DAV:}custom'));
-
- }
-
- /**
- * @depends testPropFind
- */
- function testPropPatchRemove() {
-
- $backend = $this->getBackend();
-
- $propPatch = new PropPatch(['{DAV:}displayname' => null]);
- $backend->propPatch('dir', $propPatch);
- $propPatch->commit();
-
- $propFind = new PropFind('dir', ['{DAV:}displayname']);
- $backend->propFind('dir', $propFind);
-
- $this->assertEquals(null, $propFind->get('{DAV:}displayname'));
-
- }
-
- /**
- * @depends testPropFind
- */
- function testDelete() {
-
- $backend = $this->getBackend();
- $backend->delete('dir');
-
- $propFind = new PropFind('dir', ['{DAV:}displayname']);
- $backend->propFind('dir', $propFind);
-
- $this->assertEquals(null, $propFind->get('{DAV:}displayname'));
-
- }
-
- /**
- * @depends testPropFind
- */
- function testMove() {
-
- $backend = $this->getBackend();
- // Creating a new child property.
- $propPatch = new PropPatch(['{DAV:}displayname' => 'child']);
- $backend->propPatch('dir/child', $propPatch);
- $propPatch->commit();
-
- $backend->move('dir', 'dir2');
-
- // Old 'dir'
- $propFind = new PropFind('dir', ['{DAV:}displayname']);
- $backend->propFind('dir', $propFind);
- $this->assertEquals(null, $propFind->get('{DAV:}displayname'));
-
- // Old 'dir/child'
- $propFind = new PropFind('dir/child', ['{DAV:}displayname']);
- $backend->propFind('dir/child', $propFind);
- $this->assertEquals(null, $propFind->get('{DAV:}displayname'));
-
- // New 'dir2'
- $propFind = new PropFind('dir2', ['{DAV:}displayname']);
- $backend->propFind('dir2', $propFind);
- $this->assertEquals('Directory', $propFind->get('{DAV:}displayname'));
-
- // New 'dir2/child'
- $propFind = new PropFind('dir2/child', ['{DAV:}displayname']);
- $backend->propFind('dir2/child', $propFind);
- $this->assertEquals('child', $propFind->get('{DAV:}displayname'));
- }
-
- /**
- * @depends testPropFind
- */
- function testDeepDelete() {
-
- $backend = $this->getBackend();
- $propPatch = new PropPatch(['{DAV:}displayname' => 'child']);
- $backend->propPatch('dir/child', $propPatch);
- $propPatch->commit();
- $backend->delete('dir');
-
- $propFind = new PropFind('dir/child', ['{DAV:}displayname']);
- $backend->propFind('dir/child', $propFind);
-
- $this->assertEquals(null, $propFind->get('{DAV:}displayname'));
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropertyStorage/Backend/Mock.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropertyStorage/Backend/Mock.php
deleted file mode 100644
index cf4c88fb85f..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropertyStorage/Backend/Mock.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-namespace Sabre\DAV\PropertyStorage\Backend;
-
-use Sabre\DAV\PropFind;
-use Sabre\DAV\PropPatch;
-
-class Mock implements BackendInterface {
-
- public $data = [];
-
- /**
- * Fetches properties for a path.
- *
- * This method received a PropFind object, which contains all the
- * information about the properties that need to be fetched.
- *
- * Usually you would just want to call 'get404Properties' on this object,
- * as this will give you the _exact_ list of properties that need to be
- * fetched, and haven't yet.
- *
- * @param string $path
- * @param PropFind $propFind
- * @return void
- */
- function propFind($path, PropFind $propFind) {
-
- if (!isset($this->data[$path])) {
- return;
- }
-
- foreach ($this->data[$path] as $name => $value) {
- $propFind->set($name, $value);
- }
-
- }
-
- /**
- * Updates properties for a path
- *
- * This method received a PropPatch object, which contains all the
- * information about the update.
- *
- * Usually you would want to call 'handleRemaining' on this object, to get;
- * a list of all properties that need to be stored.
- *
- * @param string $path
- * @param PropPatch $propPatch
- * @return void
- */
- function propPatch($path, PropPatch $propPatch) {
-
- if (!isset($this->data[$path])) {
- $this->data[$path] = [];
- }
- $propPatch->handleRemaining(function($properties) use ($path) {
-
- foreach ($properties as $propName => $propValue) {
-
- if (is_null($propValue)) {
- unset($this->data[$path][$propName]);
- } else {
- $this->data[$path][$propName] = $propValue;
- }
- return true;
-
- }
-
- });
-
- }
-
- /**
- * This method is called after a node is deleted.
- *
- * This allows a backend to clean up all associated properties.
- *
- * @param string $path
- * @return void
- */
- function delete($path) {
-
- unset($this->data[$path]);
-
- }
-
- /**
- * This method is called after a successful MOVE
- *
- * This should be used to migrate all properties from one path to another.
- * Note that entire collections may be moved, so ensure that all properties
- * for children are also moved along.
- *
- * @param string $source
- * @param string $destination
- * @return void
- */
- function move($source, $destination) {
-
- foreach ($this->data as $path => $props) {
-
- if ($path === $source) {
- $this->data[$destination] = $props;
- unset($this->data[$path]);
- continue;
- }
-
- if (strpos($path, $source . '/') === 0) {
- $this->data[$destination . substr($path, strlen($source) + 1)] = $props;
- unset($this->data[$path]);
- }
-
- }
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropertyStorage/Backend/PDOMysqlTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropertyStorage/Backend/PDOMysqlTest.php
deleted file mode 100644
index b92b034df84..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropertyStorage/Backend/PDOMysqlTest.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Sabre\DAV\PropertyStorage\Backend;
-
-class PDOMysqlTest extends AbstractPDOTest {
-
- public $driver = 'mysql';
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropertyStorage/Backend/PDOPgSqlTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropertyStorage/Backend/PDOPgSqlTest.php
deleted file mode 100644
index 616c2e67a6c..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropertyStorage/Backend/PDOPgSqlTest.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Sabre\DAV\PropertyStorage\Backend;
-
-class PDOPgSqlTest extends AbstractPDOTest {
-
- public $driver = 'pgsql';
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropertyStorage/Backend/PDOSqliteTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropertyStorage/Backend/PDOSqliteTest.php
deleted file mode 100644
index 20a6a09e5ba..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropertyStorage/Backend/PDOSqliteTest.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Sabre\DAV\PropertyStorage\Backend;
-
-class PDOSqliteTest extends AbstractPDOTest {
-
- public $driver = 'sqlite';
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropertyStorage/PluginTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropertyStorage/PluginTest.php
deleted file mode 100644
index 130f1490f17..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/PropertyStorage/PluginTest.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-namespace Sabre\DAV\PropertyStorage;
-
-class PluginTest extends \Sabre\DAVServerTest {
-
- protected $backend;
- protected $plugin;
-
- protected $setupFiles = true;
-
- function setUp() {
-
- parent::setUp();
- $this->backend = new Backend\Mock();
- $this->plugin = new Plugin(
- $this->backend
- );
-
- $this->server->addPlugin($this->plugin);
-
- }
-
- function testGetInfo() {
-
- $this->assertArrayHasKey(
- 'name',
- $this->plugin->getPluginInfo()
- );
-
- }
-
- function testSetProperty() {
-
- $this->server->updateProperties('', ['{DAV:}displayname' => 'hi']);
- $this->assertEquals([
- '' => [
- '{DAV:}displayname' => 'hi',
- ]
- ], $this->backend->data);
-
- }
-
- /**
- * @depends testSetProperty
- */
- function testGetProperty() {
-
- $this->testSetProperty();
- $result = $this->server->getProperties('', ['{DAV:}displayname']);
-
- $this->assertEquals([
- '{DAV:}displayname' => 'hi',
- ], $result);
-
- }
-
- /**
- * @depends testSetProperty
- */
- function testDeleteProperty() {
-
- $this->testSetProperty();
- $this->server->emit('afterUnbind', ['']);
- $this->assertEquals([], $this->backend->data);
-
- }
-
- function testMove() {
-
- $this->server->tree->getNodeForPath('files')->createFile('source');
- $this->server->updateProperties('files/source', ['{DAV:}displayname' => 'hi']);
-
- $request = new \Sabre\HTTP\Request('MOVE', '/files/source', ['Destination' => '/files/dest']);
- $this->assertHTTPStatus(201, $request);
-
- $result = $this->server->getProperties('/files/dest', ['{DAV:}displayname']);
-
- $this->assertEquals([
- '{DAV:}displayname' => 'hi',
- ], $result);
-
- $this->server->tree->getNodeForPath('files')->createFile('source');
- $result = $this->server->getProperties('/files/source', ['{DAV:}displayname']);
-
- $this->assertEquals([], $result);
-
- }
-
- /**
- * @depends testDeleteProperty
- */
- function testSetPropertyInFilteredPath() {
-
- $this->plugin->pathFilter = function($path) {
-
- return false;
-
- };
-
- $this->server->updateProperties('', ['{DAV:}displayname' => 'hi']);
- $this->assertEquals([], $this->backend->data);
-
- }
-
- /**
- * @depends testSetPropertyInFilteredPath
- */
- function testGetPropertyInFilteredPath() {
-
- $this->testSetPropertyInFilteredPath();
- $result = $this->server->getProperties('', ['{DAV:}displayname']);
-
- $this->assertEquals([], $result);
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerEventsTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerEventsTest.php
deleted file mode 100644
index 42759647ab0..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerEventsTest.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\HTTP;
-
-require_once 'Sabre/DAV/AbstractServer.php';
-
-class ServerEventsTest extends AbstractServer {
-
- private $tempPath;
-
- private $exception;
-
- function testAfterBind() {
-
- $this->server->on('afterBind', [$this, 'afterBindHandler']);
- $newPath = 'afterBind';
-
- $this->tempPath = '';
- $this->server->createFile($newPath, 'body');
- $this->assertEquals($newPath, $this->tempPath);
-
- }
-
- function afterBindHandler($path) {
-
- $this->tempPath = $path;
-
- }
-
- function testAfterResponse() {
-
- $mock = $this->getMockBuilder('stdClass')
- ->setMethods(['afterResponseCallback'])
- ->getMock();
- $mock->expects($this->once())->method('afterResponseCallback');
-
- $this->server->on('afterResponse', [$mock, 'afterResponseCallback']);
-
- $this->server->httpRequest = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'GET',
- 'REQUEST_URI' => '/test.txt',
- ]);
-
- $this->server->exec();
-
- }
-
- function testBeforeBindCancel() {
-
- $this->server->on('beforeBind', [$this, 'beforeBindCancelHandler']);
- $this->assertFalse($this->server->createFile('bla', 'body'));
-
- // Also testing put()
- $req = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'PUT',
- 'REQUEST_URI' => '/barbar',
- ]);
-
- $this->server->httpRequest = $req;
- $this->server->exec();
-
- $this->assertEquals(500, $this->server->httpResponse->getStatus());
-
- }
-
- function beforeBindCancelHandler($path) {
-
- return false;
-
- }
-
- function testException() {
-
- $this->server->on('exception', [$this, 'exceptionHandler']);
-
- $req = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'GET',
- 'REQUEST_URI' => '/not/exisitng',
- ]);
- $this->server->httpRequest = $req;
- $this->server->exec();
-
- $this->assertInstanceOf('Sabre\\DAV\\Exception\\NotFound', $this->exception);
-
- }
-
- function exceptionHandler(Exception $exception) {
-
- $this->exception = $exception;
-
- }
-
- function testMethod() {
-
- $k = 1;
- $this->server->on('method', function($request, $response) use (&$k) {
-
- $k += 1;
-
- return false;
-
- });
- $this->server->on('method', function($request, $response) use (&$k) {
-
- $k += 2;
-
- return false;
-
- });
-
- try {
- $this->server->invokeMethod(
- new HTTP\Request('BLABLA', '/'),
- new HTTP\Response(),
- false
- );
- } catch (Exception $e) {}
-
- // Fun fact, PHP 7.1 changes the order when sorting-by-callback.
- $this->assertTrue($k >= 2 && $k <= 3);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerMKCOLTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerMKCOLTest.php
deleted file mode 100644
index 557eddbbcf6..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerMKCOLTest.php
+++ /dev/null
@@ -1,366 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\HTTP;
-
-class ServerMKCOLTest extends AbstractServer {
-
- function testMkcol() {
-
- $serverVars = [
- 'REQUEST_URI' => '/testcol',
- 'REQUEST_METHOD' => 'MKCOL',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody("");
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Length' => ['0'],
- ], $this->response->getHeaders());
-
- $this->assertEquals(201, $this->response->status);
- $this->assertEquals('', $this->response->body);
- $this->assertTrue(is_dir($this->tempDir . '/testcol'));
-
- }
-
- /**
- * @depends testMkcol
- */
- function testMKCOLUnknownBody() {
-
- $serverVars = [
- 'REQUEST_URI' => '/testcol',
- 'REQUEST_METHOD' => 'MKCOL',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody("Hello");
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $this->response->getHeaders());
-
- $this->assertEquals(415, $this->response->status);
-
- }
-
- /**
- * @depends testMkcol
- */
- function testMKCOLBrokenXML() {
-
- $serverVars = [
- 'REQUEST_URI' => '/testcol',
- 'REQUEST_METHOD' => 'MKCOL',
- 'HTTP_CONTENT_TYPE' => 'application/xml',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody("Hello");
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $this->response->getHeaders());
-
- $this->assertEquals(400, $this->response->getStatus(), $this->response->getBodyAsString());
-
- }
-
- /**
- * @depends testMkcol
- */
- function testMKCOLUnknownXML() {
-
- $serverVars = [
- 'REQUEST_URI' => '/testcol',
- 'REQUEST_METHOD' => 'MKCOL',
- 'HTTP_CONTENT_TYPE' => 'application/xml',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('<?xml version="1.0"?><html></html>');
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $this->response->getHeaders());
-
- $this->assertEquals(400, $this->response->getStatus());
-
- }
-
- /**
- * @depends testMkcol
- */
- function testMKCOLNoResourceType() {
-
- $serverVars = [
- 'REQUEST_URI' => '/testcol',
- 'REQUEST_METHOD' => 'MKCOL',
- 'HTTP_CONTENT_TYPE' => 'application/xml',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('<?xml version="1.0"?>
-<mkcol xmlns="DAV:">
- <set>
- <prop>
- <displayname>Evert</displayname>
- </prop>
- </set>
-</mkcol>');
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $this->response->getHeaders());
-
- $this->assertEquals(400, $this->response->status, 'Wrong statuscode received. Full response body: ' . $this->response->body);
-
- }
-
- /**
- * @depends testMkcol
- */
- function testMKCOLIncorrectResourceType() {
-
- $serverVars = [
- 'REQUEST_URI' => '/testcol',
- 'REQUEST_METHOD' => 'MKCOL',
- 'HTTP_CONTENT_TYPE' => 'application/xml',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('<?xml version="1.0"?>
-<mkcol xmlns="DAV:">
- <set>
- <prop>
- <resourcetype><collection /><blabla /></resourcetype>
- </prop>
- </set>
-</mkcol>');
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $this->response->getHeaders());
-
- $this->assertEquals(403, $this->response->status, 'Wrong statuscode received. Full response body: ' . $this->response->body);
-
- }
-
- /**
- * @depends testMKCOLIncorrectResourceType
- */
- function testMKCOLSuccess() {
-
- $serverVars = [
- 'REQUEST_URI' => '/testcol',
- 'REQUEST_METHOD' => 'MKCOL',
- 'HTTP_CONTENT_TYPE' => 'application/xml',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('<?xml version="1.0"?>
-<mkcol xmlns="DAV:">
- <set>
- <prop>
- <resourcetype><collection /></resourcetype>
- </prop>
- </set>
-</mkcol>');
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Length' => ['0'],
- ], $this->response->getHeaders());
-
- $this->assertEquals(201, $this->response->status, 'Wrong statuscode received. Full response body: ' . $this->response->body);
-
- }
-
- /**
- * @depends testMKCOLIncorrectResourceType
- */
- function testMKCOLWhiteSpaceResourceType() {
-
- $serverVars = [
- 'REQUEST_URI' => '/testcol',
- 'REQUEST_METHOD' => 'MKCOL',
- 'HTTP_CONTENT_TYPE' => 'application/xml',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('<?xml version="1.0"?>
-<mkcol xmlns="DAV:">
- <set>
- <prop>
- <resourcetype>
- <collection />
- </resourcetype>
- </prop>
- </set>
-</mkcol>');
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Length' => ['0'],
- ], $this->response->getHeaders());
-
- $this->assertEquals(201, $this->response->status, 'Wrong statuscode received. Full response body: ' . $this->response->body);
-
- }
-
- /**
- * @depends testMKCOLIncorrectResourceType
- */
- function testMKCOLNoParent() {
-
- $serverVars = [
- 'REQUEST_URI' => '/testnoparent/409me',
- 'REQUEST_METHOD' => 'MKCOL',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('');
-
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $this->response->getHeaders());
-
- $this->assertEquals(409, $this->response->status, 'Wrong statuscode received. Full response body: ' . $this->response->body);
-
- }
-
- /**
- * @depends testMKCOLIncorrectResourceType
- */
- function testMKCOLParentIsNoCollection() {
-
- $serverVars = [
- 'REQUEST_URI' => '/test.txt/409me',
- 'REQUEST_METHOD' => 'MKCOL',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('');
-
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $this->response->getHeaders());
-
- $this->assertEquals(409, $this->response->status, 'Wrong statuscode received. Full response body: ' . $this->response->body);
-
- }
-
- /**
- * @depends testMKCOLIncorrectResourceType
- */
- function testMKCOLAlreadyExists() {
-
- $serverVars = [
- 'REQUEST_URI' => '/test.txt',
- 'REQUEST_METHOD' => 'MKCOL',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody('');
-
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- 'Allow' => ['OPTIONS, GET, HEAD, DELETE, PROPFIND, PUT, PROPPATCH, COPY, MOVE, REPORT'],
- ], $this->response->getHeaders());
-
- $this->assertEquals(405, $this->response->status, 'Wrong statuscode received. Full response body: ' . $this->response->body);
-
- }
-
- /**
- * @depends testMKCOLSuccess
- * @depends testMKCOLAlreadyExists
- */
- function testMKCOLAndProps() {
-
- $request = new HTTP\Request(
- 'MKCOL',
- '/testcol',
- ['Content-Type' => 'application/xml']
- );
- $request->setBody('<?xml version="1.0"?>
-<mkcol xmlns="DAV:">
- <set>
- <prop>
- <resourcetype><collection /></resourcetype>
- <displayname>my new collection</displayname>
- </prop>
- </set>
-</mkcol>');
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals(207, $this->response->status, 'Wrong statuscode received. Full response body: ' . $this->response->body);
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $this->response->getHeaders());
-
- $responseBody = $this->response->getBodyAsString();
-
- $expected = <<<XML
-<?xml version="1.0"?>
-<d:multistatus xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
- <d:response>
- <d:href>/testcol</d:href>
- <d:propstat>
- <d:prop>
- <d:displayname />
- </d:prop>
- <d:status>HTTP/1.1 403 Forbidden</d:status>
- </d:propstat>
- </d:response>
-</d:multistatus>
-XML;
-
- $this->assertXmlStringEqualsXmlString(
- $expected,
- $responseBody
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerPluginTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerPluginTest.php
deleted file mode 100644
index fa67102cc43..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerPluginTest.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\HTTP;
-
-require_once 'Sabre/DAV/AbstractServer.php';
-require_once 'Sabre/DAV/TestPlugin.php';
-
-class ServerPluginTest extends AbstractServer {
-
- /**
- * @var Sabre\DAV\TestPlugin
- */
- protected $testPlugin;
-
- function setUp() {
-
- parent::setUp();
-
- $testPlugin = new TestPlugin();
- $this->server->addPlugin($testPlugin);
- $this->testPlugin = $testPlugin;
-
- }
-
- /**
- */
- function testBaseClass() {
-
- $p = new ServerPluginMock();
- $this->assertEquals([], $p->getFeatures());
- $this->assertEquals([], $p->getHTTPMethods(''));
- $this->assertEquals(
- [
- 'name' => 'Sabre\DAV\ServerPluginMock',
- 'description' => null,
- 'link' => null
- ], $p->getPluginInfo()
- );
-
- }
-
- function testOptions() {
-
- $serverVars = [
- 'REQUEST_URI' => '/',
- 'REQUEST_METHOD' => 'OPTIONS',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'DAV' => ['1, 3, extended-mkcol, drinking'],
- 'MS-Author-Via' => ['DAV'],
- 'Allow' => ['OPTIONS, GET, HEAD, DELETE, PROPFIND, PUT, PROPPATCH, COPY, MOVE, REPORT, BEER, WINE'],
- 'Accept-Ranges' => ['bytes'],
- 'Content-Length' => ['0'],
- 'X-Sabre-Version' => [Version::VERSION],
- ], $this->response->getHeaders());
-
- $this->assertEquals(200, $this->response->status);
- $this->assertEquals('', $this->response->body);
- $this->assertEquals('OPTIONS', $this->testPlugin->beforeMethod);
-
-
- }
-
- function testGetPlugin() {
-
- $this->assertEquals($this->testPlugin, $this->server->getPlugin(get_class($this->testPlugin)));
-
- }
-
- function testUnknownPlugin() {
-
- $this->assertNull($this->server->getPlugin('SomeRandomClassName'));
-
- }
-
- function testGetSupportedReportSet() {
-
- $this->assertEquals([], $this->testPlugin->getSupportedReportSet('/'));
-
- }
-
- function testGetPlugins() {
-
- $this->assertEquals(
- [
- get_class($this->testPlugin) => $this->testPlugin,
- 'core' => $this->server->getPlugin('core'),
- ],
- $this->server->getPlugins()
- );
-
- }
-
-
-}
-
-class ServerPluginMock extends ServerPlugin {
-
- function initialize(Server $s) { }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerPreconditionTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerPreconditionTest.php
deleted file mode 100644
index 203cf26d9d4..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerPreconditionTest.php
+++ /dev/null
@@ -1,344 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\HTTP;
-
-require_once 'Sabre/HTTP/ResponseMock.php';
-
-class ServerPreconditionsTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * @expectedException Sabre\DAV\Exception\PreconditionFailed
- */
- function testIfMatchNoNode() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = new HTTP\Request('GET', '/bar', ['If-Match' => '*']);
- $httpResponse = new HTTP\Response();
- $server->checkPreconditions($httpRequest, $httpResponse);
-
- }
-
- /**
- */
- function testIfMatchHasNode() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = new HTTP\Request('GET', '/foo', ['If-Match' => '*']);
- $httpResponse = new HTTP\Response();
- $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\PreconditionFailed
- */
- function testIfMatchWrongEtag() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = new HTTP\Request('GET', '/foo', ['If-Match' => '1234']);
- $httpResponse = new HTTP\Response();
- $server->checkPreconditions($httpRequest, $httpResponse);
-
- }
-
- /**
- */
- function testIfMatchCorrectEtag() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = new HTTP\Request('GET', '/foo', ['If-Match' => '"abc123"']);
- $httpResponse = new HTTP\Response();
- $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
-
- }
-
- /**
- * Evolution sometimes uses \" instead of " for If-Match headers.
- *
- * @depends testIfMatchCorrectEtag
- */
- function testIfMatchEvolutionEtag() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = new HTTP\Request('GET', '/foo', ['If-Match' => '\\"abc123\\"']);
- $httpResponse = new HTTP\Response();
- $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
-
- }
-
- /**
- */
- function testIfMatchMultiple() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = new HTTP\Request('GET', '/foo', ['If-Match' => '"hellothere", "abc123"']);
- $httpResponse = new HTTP\Response();
- $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
-
- }
-
- /**
- */
- function testIfNoneMatchNoNode() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = new HTTP\Request('GET', '/bar', ['If-None-Match' => '*']);
- $httpResponse = new HTTP\Response();
- $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\PreconditionFailed
- */
- function testIfNoneMatchHasNode() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = new HTTP\Request('POST', '/foo', ['If-None-Match' => '*']);
- $httpResponse = new HTTP\Response();
- $server->checkPreconditions($httpRequest, $httpResponse);
-
- }
-
- /**
- */
- function testIfNoneMatchWrongEtag() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = new HTTP\Request('POST', '/foo', ['If-None-Match' => '"1234"']);
- $httpResponse = new HTTP\Response();
- $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
-
- }
-
- /**
- */
- function testIfNoneMatchWrongEtagMultiple() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = new HTTP\Request('POST', '/foo', ['If-None-Match' => '"1234", "5678"']);
- $httpResponse = new HTTP\Response();
- $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\PreconditionFailed
- */
- function testIfNoneMatchCorrectEtag() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = new HTTP\Request('POST', '/foo', ['If-None-Match' => '"abc123"']);
- $httpResponse = new HTTP\Response();
- $server->checkPreconditions($httpRequest, $httpResponse);
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\PreconditionFailed
- */
- function testIfNoneMatchCorrectEtagMultiple() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = new HTTP\Request('POST', '/foo', ['If-None-Match' => '"1234, "abc123"']);
- $httpResponse = new HTTP\Response();
- $server->checkPreconditions($httpRequest, $httpResponse);
-
- }
-
- /**
- */
- function testIfNoneMatchCorrectEtagAsGet() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = new HTTP\Request('GET', '/foo', ['If-None-Match' => '"abc123"']);
- $server->httpResponse = new HTTP\ResponseMock();
-
- $this->assertFalse($server->checkPreconditions($httpRequest, $server->httpResponse));
- $this->assertEquals(304, $server->httpResponse->getStatus());
- $this->assertEquals(['ETag' => ['"abc123"']], $server->httpResponse->getHeaders());
-
- }
-
- /**
- * This was a test written for issue #515.
- */
- function testNoneMatchCorrectEtagEnsureSapiSent() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $server->sapi = new HTTP\SapiMock();
- HTTP\SapiMock::$sent = 0;
- $httpRequest = new HTTP\Request('GET', '/foo', ['If-None-Match' => '"abc123"']);
- $server->httpRequest = $httpRequest;
- $server->httpResponse = new HTTP\ResponseMock();
-
- $server->exec();
-
- $this->assertFalse($server->checkPreconditions($httpRequest, $server->httpResponse));
- $this->assertEquals(304, $server->httpResponse->getStatus());
- $this->assertEquals([
- 'ETag' => ['"abc123"'],
- 'X-Sabre-Version' => [Version::VERSION],
- ], $server->httpResponse->getHeaders());
- $this->assertEquals(1, HTTP\SapiMock::$sent);
-
- }
-
- /**
- */
- function testIfModifiedSinceUnModified() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = HTTP\Sapi::createFromServerArray([
- 'HTTP_IF_MODIFIED_SINCE' => 'Sun, 06 Nov 1994 08:49:37 GMT',
- 'REQUEST_URI' => '/foo'
- ]);
- $server->httpResponse = new HTTP\ResponseMock();
- $this->assertFalse($server->checkPreconditions($httpRequest, $server->httpResponse));
-
- $this->assertEquals(304, $server->httpResponse->status);
- $this->assertEquals([
- 'Last-Modified' => ['Sat, 06 Apr 1985 23:30:00 GMT'],
- ], $server->httpResponse->getHeaders());
-
- }
-
-
- /**
- */
- function testIfModifiedSinceModified() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = HTTP\Sapi::createFromServerArray([
- 'HTTP_IF_MODIFIED_SINCE' => 'Tue, 06 Nov 1984 08:49:37 GMT',
- 'REQUEST_URI' => '/foo'
- ]);
-
- $httpResponse = new HTTP\ResponseMock();
- $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
-
- }
-
- /**
- */
- function testIfModifiedSinceInvalidDate() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = HTTP\Sapi::createFromServerArray([
- 'HTTP_IF_MODIFIED_SINCE' => 'Your mother',
- 'REQUEST_URI' => '/foo'
- ]);
- $httpResponse = new HTTP\ResponseMock();
-
- // Invalid dates must be ignored, so this should return true
- $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
-
- }
-
- /**
- */
- function testIfModifiedSinceInvalidDate2() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = HTTP\Sapi::createFromServerArray([
- 'HTTP_IF_MODIFIED_SINCE' => 'Sun, 06 Nov 1994 08:49:37 EST',
- 'REQUEST_URI' => '/foo'
- ]);
- $httpResponse = new HTTP\ResponseMock();
- $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
-
- }
-
-
- /**
- */
- function testIfUnmodifiedSinceUnModified() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = HTTP\Sapi::createFromServerArray([
- 'HTTP_IF_UNMODIFIED_SINCE' => 'Sun, 06 Nov 1994 08:49:37 GMT',
- 'REQUEST_URI' => '/foo'
- ]);
- $httpResponse = new HTTP\Response();
- $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
-
- }
-
-
- /**
- * @expectedException Sabre\DAV\Exception\PreconditionFailed
- */
- function testIfUnmodifiedSinceModified() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = HTTP\Sapi::createFromServerArray([
- 'HTTP_IF_UNMODIFIED_SINCE' => 'Tue, 06 Nov 1984 08:49:37 GMT',
- 'REQUEST_URI' => '/foo'
- ]);
- $httpResponse = new HTTP\ResponseMock();
- $server->checkPreconditions($httpRequest, $httpResponse);
-
- }
-
- /**
- */
- function testIfUnmodifiedSinceInvalidDate() {
-
- $root = new SimpleCollection('root', [new ServerPreconditionsNode()]);
- $server = new Server($root);
- $httpRequest = HTTP\Sapi::createFromServerArray([
- 'HTTP_IF_UNMODIFIED_SINCE' => 'Sun, 06 Nov 1984 08:49:37 CET',
- 'REQUEST_URI' => '/foo'
- ]);
- $httpResponse = new HTTP\ResponseMock();
- $this->assertTrue($server->checkPreconditions($httpRequest, $httpResponse));
-
- }
-
-
-}
-
-class ServerPreconditionsNode extends File {
-
- function getETag() {
-
- return '"abc123"';
-
- }
-
- function getLastModified() {
-
- /* my birthday & time, I believe */
- return strtotime('1985-04-07 01:30 +02:00');
-
- }
-
- function getName() {
-
- return 'foo';
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerPropsInfiniteDepthTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerPropsInfiniteDepthTest.php
deleted file mode 100644
index c968e72008a..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerPropsInfiniteDepthTest.php
+++ /dev/null
@@ -1,163 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\HTTP;
-
-require_once 'Sabre/DAV/AbstractServer.php';
-
-class ServerPropsInfiniteDepthTest extends AbstractServer {
-
- protected function getRootNode() {
-
- return new FSExt\Directory(SABRE_TEMPDIR);
-
- }
-
- function setUp() {
-
- if (file_exists(SABRE_TEMPDIR . '../.sabredav')) unlink(SABRE_TEMPDIR . '../.sabredav');
- parent::setUp();
- file_put_contents(SABRE_TEMPDIR . '/test2.txt', 'Test contents2');
- mkdir(SABRE_TEMPDIR . '/col');
- mkdir(SABRE_TEMPDIR . '/col/col');
- file_put_contents(SABRE_TEMPDIR . 'col/col/test.txt', 'Test contents');
- $this->server->addPlugin(new Locks\Plugin(new Locks\Backend\File(SABRE_TEMPDIR . '/.locksdb')));
- $this->server->enablePropfindDepthInfinity = true;
-
- }
-
- function tearDown() {
-
- parent::tearDown();
- if (file_exists(SABRE_TEMPDIR . '../.locksdb')) unlink(SABRE_TEMPDIR . '../.locksdb');
-
- }
-
- private function sendRequest($body) {
-
- $request = new HTTP\Request('PROPFIND', '/', ['Depth' => 'infinity']);
- $request->setBody($body);
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- }
-
- function testPropFindEmptyBody() {
-
- $this->sendRequest("");
-
- $this->assertEquals(207, $this->response->status, 'Incorrect status received. Full response body: ' . $this->response->getBodyAsString());
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- 'DAV' => ['1, 3, extended-mkcol, 2'],
- 'Vary' => ['Brief,Prefer'],
- ],
- $this->response->getHeaders()
- );
-
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", "xmlns\\1=\"urn:DAV\"", $this->response->body);
- $xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d', 'urn:DAV');
-
- list($data) = $xml->xpath('/d:multistatus/d:response/d:href');
- $this->assertEquals('/', (string)$data, 'href element should have been /');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:resourcetype');
- // 8 resources are to be returned: /, col, col/col, col/col/test.txt, dir, dir/child.txt, test.txt and test2.txt
- $this->assertEquals(8, count($data));
-
- }
-
- function testSupportedLocks() {
-
- $xml = '<?xml version="1.0"?>
-<d:propfind xmlns:d="DAV:">
- <d:prop>
- <d:supportedlock />
- </d:prop>
-</d:propfind>';
-
- $this->sendRequest($xml);
-
- $body = $this->response->getBodyAsString();
- $this->assertEquals(207, $this->response->getStatus(), $body);
-
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", "xmlns\\1=\"urn:DAV\"", $body);
- $xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d', 'urn:DAV');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supportedlock/d:lockentry');
- $this->assertEquals(16, count($data), 'We expected sixteen \'d:lockentry\' tags');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supportedlock/d:lockentry/d:lockscope');
- $this->assertEquals(16, count($data), 'We expected sixteen \'d:lockscope\' tags');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supportedlock/d:lockentry/d:locktype');
- $this->assertEquals(16, count($data), 'We expected sixteen \'d:locktype\' tags');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supportedlock/d:lockentry/d:lockscope/d:shared');
- $this->assertEquals(8, count($data), 'We expected eight \'d:shared\' tags');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supportedlock/d:lockentry/d:lockscope/d:exclusive');
- $this->assertEquals(8, count($data), 'We expected eight \'d:exclusive\' tags');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supportedlock/d:lockentry/d:locktype/d:write');
- $this->assertEquals(16, count($data), 'We expected sixteen \'d:write\' tags');
- }
-
- function testLockDiscovery() {
-
- $xml = '<?xml version="1.0"?>
-<d:propfind xmlns:d="DAV:">
- <d:prop>
- <d:lockdiscovery />
- </d:prop>
-</d:propfind>';
-
- $this->sendRequest($xml);
-
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", "xmlns\\1=\"urn:DAV\"", $this->response->body);
- $xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d', 'urn:DAV');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:lockdiscovery');
- $this->assertEquals(8, count($data), 'We expected eight \'d:lockdiscovery\' tags');
-
- }
-
- function testUnknownProperty() {
-
- $xml = '<?xml version="1.0"?>
-<d:propfind xmlns:d="DAV:">
- <d:prop>
- <d:macaroni />
- </d:prop>
-</d:propfind>';
-
- $this->sendRequest($xml);
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", "xmlns\\1=\"urn:DAV\"", $this->response->body);
- $xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d', 'urn:DAV');
- $pathTests = [
- '/d:multistatus',
- '/d:multistatus/d:response',
- '/d:multistatus/d:response/d:propstat',
- '/d:multistatus/d:response/d:propstat/d:status',
- '/d:multistatus/d:response/d:propstat/d:prop',
- '/d:multistatus/d:response/d:propstat/d:prop/d:macaroni',
- ];
- foreach ($pathTests as $test) {
- $this->assertTrue(count($xml->xpath($test)) == true, 'We expected the ' . $test . ' element to appear in the response, we got: ' . $body);
- }
-
- $val = $xml->xpath('/d:multistatus/d:response/d:propstat/d:status');
- $this->assertEquals(8, count($val), $body);
- $this->assertEquals('HTTP/1.1 404 Not Found', (string)$val[0]);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerPropsTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerPropsTest.php
deleted file mode 100644
index 253200be7cf..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerPropsTest.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\HTTP;
-
-require_once 'Sabre/HTTP/ResponseMock.php';
-require_once 'Sabre/DAV/AbstractServer.php';
-
-class ServerPropsTest extends AbstractServer {
-
- protected function getRootNode() {
-
- return new FSExt\Directory(SABRE_TEMPDIR);
-
- }
-
- function setUp() {
-
- if (file_exists(SABRE_TEMPDIR . '../.sabredav')) unlink(SABRE_TEMPDIR . '../.sabredav');
- parent::setUp();
- file_put_contents(SABRE_TEMPDIR . '/test2.txt', 'Test contents2');
- mkdir(SABRE_TEMPDIR . '/col');
- file_put_contents(SABRE_TEMPDIR . 'col/test.txt', 'Test contents');
- $this->server->addPlugin(new Locks\Plugin(new Locks\Backend\File(SABRE_TEMPDIR . '/.locksdb')));
-
- }
-
- function tearDown() {
-
- parent::tearDown();
- if (file_exists(SABRE_TEMPDIR . '../.locksdb')) unlink(SABRE_TEMPDIR . '../.locksdb');
-
- }
-
- private function sendRequest($body, $path = '/', $headers = ['Depth' => '0']) {
-
- $request = new HTTP\Request('PROPFIND', $path, $headers, $body);
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- }
-
- function testPropFindEmptyBody() {
-
- $this->sendRequest("");
- $this->assertEquals(207, $this->response->status);
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- 'DAV' => ['1, 3, extended-mkcol, 2'],
- 'Vary' => ['Brief,Prefer'],
- ],
- $this->response->getHeaders()
- );
-
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", "xmlns\\1=\"urn:DAV\"", $this->response->body);
- $xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d', 'urn:DAV');
-
- list($data) = $xml->xpath('/d:multistatus/d:response/d:href');
- $this->assertEquals('/', (string)$data, 'href element should have been /');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:resourcetype');
- $this->assertEquals(1, count($data));
-
- }
-
- function testPropFindEmptyBodyFile() {
-
- $this->sendRequest("", '/test2.txt', []);
- $this->assertEquals(207, $this->response->status);
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- 'DAV' => ['1, 3, extended-mkcol, 2'],
- 'Vary' => ['Brief,Prefer'],
- ],
- $this->response->getHeaders()
- );
-
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", "xmlns\\1=\"urn:DAV\"", $this->response->body);
- $xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d', 'urn:DAV');
-
- list($data) = $xml->xpath('/d:multistatus/d:response/d:href');
- $this->assertEquals('/test2.txt', (string)$data, 'href element should have been /test2.txt');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:getcontentlength');
- $this->assertEquals(1, count($data));
-
- }
-
- function testSupportedLocks() {
-
- $xml = '<?xml version="1.0"?>
-<d:propfind xmlns:d="DAV:">
- <d:prop>
- <d:supportedlock />
- </d:prop>
-</d:propfind>';
-
- $this->sendRequest($xml);
-
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", "xmlns\\1=\"urn:DAV\"", $this->response->body);
- $xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d', 'urn:DAV');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supportedlock/d:lockentry');
- $this->assertEquals(2, count($data), 'We expected two \'d:lockentry\' tags');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supportedlock/d:lockentry/d:lockscope');
- $this->assertEquals(2, count($data), 'We expected two \'d:lockscope\' tags');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supportedlock/d:lockentry/d:locktype');
- $this->assertEquals(2, count($data), 'We expected two \'d:locktype\' tags');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supportedlock/d:lockentry/d:lockscope/d:shared');
- $this->assertEquals(1, count($data), 'We expected a \'d:shared\' tag');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supportedlock/d:lockentry/d:lockscope/d:exclusive');
- $this->assertEquals(1, count($data), 'We expected a \'d:exclusive\' tag');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supportedlock/d:lockentry/d:locktype/d:write');
- $this->assertEquals(2, count($data), 'We expected two \'d:write\' tags');
- }
-
- function testLockDiscovery() {
-
- $xml = '<?xml version="1.0"?>
-<d:propfind xmlns:d="DAV:">
- <d:prop>
- <d:lockdiscovery />
- </d:prop>
-</d:propfind>';
-
- $this->sendRequest($xml);
-
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", "xmlns\\1=\"urn:DAV\"", $this->response->body);
- $xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d', 'urn:DAV');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:lockdiscovery');
- $this->assertEquals(1, count($data), 'We expected a \'d:lockdiscovery\' tag');
-
- }
-
- function testUnknownProperty() {
-
- $xml = '<?xml version="1.0"?>
-<d:propfind xmlns:d="DAV:">
- <d:prop>
- <d:macaroni />
- </d:prop>
-</d:propfind>';
-
- $this->sendRequest($xml);
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", "xmlns\\1=\"urn:DAV\"", $this->response->body);
- $xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d', 'urn:DAV');
- $pathTests = [
- '/d:multistatus',
- '/d:multistatus/d:response',
- '/d:multistatus/d:response/d:propstat',
- '/d:multistatus/d:response/d:propstat/d:status',
- '/d:multistatus/d:response/d:propstat/d:prop',
- '/d:multistatus/d:response/d:propstat/d:prop/d:macaroni',
- ];
- foreach ($pathTests as $test) {
- $this->assertTrue(count($xml->xpath($test)) == true, 'We expected the ' . $test . ' element to appear in the response, we got: ' . $body);
- }
-
- $val = $xml->xpath('/d:multistatus/d:response/d:propstat/d:status');
- $this->assertEquals(1, count($val), $body);
- $this->assertEquals('HTTP/1.1 404 Not Found', (string)$val[0]);
-
- }
-
- function testParsePropPatchRequest() {
-
- $body = '<?xml version="1.0"?>
-<d:propertyupdate xmlns:d="DAV:" xmlns:s="http://sabredav.org/NS/test">
- <d:set><d:prop><s:someprop>somevalue</s:someprop></d:prop></d:set>
- <d:remove><d:prop><s:someprop2 /></d:prop></d:remove>
- <d:set><d:prop><s:someprop3>removeme</s:someprop3></d:prop></d:set>
- <d:remove><d:prop><s:someprop3 /></d:prop></d:remove>
-</d:propertyupdate>';
-
- $result = $this->server->xml->parse($body);
- $this->assertEquals([
- '{http://sabredav.org/NS/test}someprop' => 'somevalue',
- '{http://sabredav.org/NS/test}someprop2' => null,
- '{http://sabredav.org/NS/test}someprop3' => null,
- ], $result->properties);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerRangeTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerRangeTest.php
deleted file mode 100644
index 81224d687c3..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerRangeTest.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use DateTime;
-use Sabre\HTTP;
-
-/**
- * This file tests HTTP requests that use the Range: header.
- *
- * @copyright Copyright (C) fruux GmbH. (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class ServerRangeTest extends \Sabre\DAVServerTest {
-
- protected $setupFiles = true;
-
- /**
- * We need this string a lot
- */
- protected $lastModified;
-
- function setUp() {
-
- parent::setUp();
- $this->server->createFile('files/test.txt', 'Test contents');
-
- $this->lastModified = HTTP\Util::toHTTPDate(
- new DateTime('@' . $this->server->tree->getNodeForPath('files/test.txt')->getLastModified())
- );
-
- $stream = popen('echo "Test contents"', 'r');
- $streamingFile = new Mock\StreamingFile(
- 'no-seeking.txt',
- $stream
- );
- $streamingFile->setSize(12);
- $this->server->tree->getNodeForPath('files')->addNode($streamingFile);
-
- }
-
- function testRange() {
-
- $request = new HTTP\Request('GET', '/files/test.txt', ['Range' => 'bytes=2-5']);
- $response = $this->request($request);
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/octet-stream'],
- 'Content-Length' => [4],
- 'Content-Range' => ['bytes 2-5/13'],
- 'ETag' => ['"' . md5('Test contents') . '"'],
- 'Last-Modified' => [$this->lastModified],
- ],
- $response->getHeaders()
- );
- $this->assertEquals(206, $response->getStatus());
- $this->assertEquals('st c', $response->getBodyAsString());
-
- }
-
- /**
- * @depends testRange
- */
- function testStartRange() {
-
- $request = new HTTP\Request('GET', '/files/test.txt', ['Range' => 'bytes=2-']);
- $response = $this->request($request);
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/octet-stream'],
- 'Content-Length' => [11],
- 'Content-Range' => ['bytes 2-12/13'],
- 'ETag' => ['"' . md5('Test contents') . '"'],
- 'Last-Modified' => [$this->lastModified],
- ],
- $response->getHeaders()
- );
-
- $this->assertEquals(206, $response->getStatus());
- $this->assertEquals('st contents', $response->getBodyAsString());
-
- }
-
- /**
- * @depends testRange
- */
- function testEndRange() {
-
- $request = new HTTP\Request('GET', '/files/test.txt', ['Range' => 'bytes=-8']);
- $response = $this->request($request);
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/octet-stream'],
- 'Content-Length' => [8],
- 'Content-Range' => ['bytes 5-12/13'],
- 'ETag' => ['"' . md5('Test contents') . '"'],
- 'Last-Modified' => [$this->lastModified],
- ],
- $response->getHeaders()
- );
-
- $this->assertEquals(206, $response->getStatus());
- $this->assertEquals('contents', $response->getBodyAsString());
-
- }
-
- /**
- * @depends testRange
- */
- function testTooHighRange() {
-
- $request = new HTTP\Request('GET', '/files/test.txt', ['Range' => 'bytes=100-200']);
- $response = $this->request($request);
-
- $this->assertEquals(416, $response->getStatus());
-
- }
-
- /**
- * @depends testRange
- */
- function testCrazyRange() {
-
- $request = new HTTP\Request('GET', '/files/test.txt', ['Range' => 'bytes=8-4']);
- $response = $this->request($request);
-
- $this->assertEquals(416, $response->getStatus());
-
- }
-
- function testNonSeekableStream() {
-
- $request = new HTTP\Request('GET', '/files/no-seeking.txt', ['Range' => 'bytes=2-5']);
- $response = $this->request($request);
-
- $this->assertEquals(206, $response->getStatus(), $response);
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/octet-stream'],
- 'Content-Length' => [4],
- 'Content-Range' => ['bytes 2-5/12'],
- // 'ETag' => ['"' . md5('Test contents') . '"'],
- 'Last-Modified' => [$this->lastModified],
- ],
- $response->getHeaders()
- );
-
- $this->assertEquals('st c', $response->getBodyAsString());
-
- }
-
- /**
- * @depends testRange
- */
- function testIfRangeEtag() {
-
- $request = new HTTP\Request('GET', '/files/test.txt', [
- 'Range' => 'bytes=2-5',
- 'If-Range' => '"' . md5('Test contents') . '"',
- ]);
- $response = $this->request($request);
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/octet-stream'],
- 'Content-Length' => [4],
- 'Content-Range' => ['bytes 2-5/13'],
- 'ETag' => ['"' . md5('Test contents') . '"'],
- 'Last-Modified' => [$this->lastModified],
- ],
- $response->getHeaders()
- );
-
- $this->assertEquals(206, $response->getStatus());
- $this->assertEquals('st c', $response->getBodyAsString());
-
- }
-
- /**
- * @depends testIfRangeEtag
- */
- function testIfRangeEtagIncorrect() {
-
- $request = new HTTP\Request('GET', '/files/test.txt', [
- 'Range' => 'bytes=2-5',
- 'If-Range' => '"foobar"',
- ]);
- $response = $this->request($request);
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/octet-stream'],
- 'Content-Length' => [13],
- 'ETag' => ['"' . md5('Test contents') . '"'],
- 'Last-Modified' => [$this->lastModified],
- ],
- $response->getHeaders()
- );
-
- $this->assertEquals(200, $response->getStatus());
- $this->assertEquals('Test contents', $response->getBodyAsString());
-
- }
-
- /**
- * @depends testIfRangeEtag
- */
- function testIfRangeModificationDate() {
-
- $request = new HTTP\Request('GET', '/files/test.txt', [
- 'Range' => 'bytes=2-5',
- 'If-Range' => 'tomorrow',
- ]);
- $response = $this->request($request);
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/octet-stream'],
- 'Content-Length' => [4],
- 'Content-Range' => ['bytes 2-5/13'],
- 'ETag' => ['"' . md5('Test contents') . '"'],
- 'Last-Modified' => [$this->lastModified],
- ],
- $response->getHeaders()
- );
-
- $this->assertEquals(206, $response->getStatus());
- $this->assertEquals('st c', $response->getBodyAsString());
-
- }
-
- /**
- * @depends testIfRangeModificationDate
- */
- function testIfRangeModificationDateModified() {
-
- $request = new HTTP\Request('GET', '/files/test.txt', [
- 'Range' => 'bytes=2-5',
- 'If-Range' => '-2 years',
- ]);
- $response = $this->request($request);
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/octet-stream'],
- 'Content-Length' => [13],
- 'ETag' => ['"' . md5('Test contents') . '"'],
- 'Last-Modified' => [$this->lastModified],
- ],
- $response->getHeaders()
- );
-
- $this->assertEquals(200, $response->getStatus());
- $this->assertEquals('Test contents', $response->getBodyAsString());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerSimpleTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerSimpleTest.php
deleted file mode 100644
index 043179a0051..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerSimpleTest.php
+++ /dev/null
@@ -1,475 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\HTTP;
-
-class ServerSimpleTest extends AbstractServer{
-
- function testConstructArray() {
-
- $nodes = [
- new SimpleCollection('hello')
- ];
-
- $server = new Server($nodes);
- $this->assertEquals($nodes[0], $server->tree->getNodeForPath('hello'));
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception
- */
- function testConstructIncorrectObj() {
-
- $nodes = [
- new SimpleCollection('hello'),
- new \STDClass(),
- ];
-
- $server = new Server($nodes);
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception
- */
- function testConstructInvalidArg() {
-
- $server = new Server(1);
-
- }
-
- function testOptions() {
-
- $request = new HTTP\Request('OPTIONS', '/');
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals([
- 'DAV' => ['1, 3, extended-mkcol'],
- 'MS-Author-Via' => ['DAV'],
- 'Allow' => ['OPTIONS, GET, HEAD, DELETE, PROPFIND, PUT, PROPPATCH, COPY, MOVE, REPORT'],
- 'Accept-Ranges' => ['bytes'],
- 'Content-Length' => ['0'],
- 'X-Sabre-Version' => [Version::VERSION],
- ], $this->response->getHeaders());
-
- $this->assertEquals(200, $this->response->status);
- $this->assertEquals('', $this->response->body);
-
- }
-
- function testOptionsUnmapped() {
-
- $request = new HTTP\Request('OPTIONS', '/unmapped');
- $this->server->httpRequest = $request;
-
- $this->server->exec();
-
- $this->assertEquals([
- 'DAV' => ['1, 3, extended-mkcol'],
- 'MS-Author-Via' => ['DAV'],
- 'Allow' => ['OPTIONS, GET, HEAD, DELETE, PROPFIND, PUT, PROPPATCH, COPY, MOVE, REPORT, MKCOL'],
- 'Accept-Ranges' => ['bytes'],
- 'Content-Length' => ['0'],
- 'X-Sabre-Version' => [Version::VERSION],
- ], $this->response->getHeaders());
-
- $this->assertEquals(200, $this->response->status);
- $this->assertEquals('', $this->response->body);
-
- }
-
- function testNonExistantMethod() {
-
- $serverVars = [
- 'REQUEST_URI' => '/',
- 'REQUEST_METHOD' => 'BLABLA',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $this->response->getHeaders());
-
- $this->assertEquals(501, $this->response->status);
-
-
- }
-
- function testBaseUri() {
-
- $serverVars = [
- 'REQUEST_URI' => '/blabla/test.txt',
- 'REQUEST_METHOD' => 'GET',
- ];
- $filename = $this->tempDir . '/test.txt';
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $this->server->setBaseUri('/blabla/');
- $this->assertEquals('/blabla/', $this->server->getBaseUri());
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/octet-stream'],
- 'Content-Length' => [13],
- 'Last-Modified' => [HTTP\Util::toHTTPDate(new \DateTime('@' . filemtime($filename)))],
- 'ETag' => ['"' . sha1(fileinode($filename) . filesize($filename) . filemtime($filename)) . '"'],
- ],
- $this->response->getHeaders()
- );
-
- $this->assertEquals(200, $this->response->status);
- $this->assertEquals('Test contents', stream_get_contents($this->response->body));
-
- }
-
- function testBaseUriAddSlash() {
-
- $tests = [
- '/' => '/',
- '/foo' => '/foo/',
- '/foo/' => '/foo/',
- '/foo/bar' => '/foo/bar/',
- '/foo/bar/' => '/foo/bar/',
- ];
-
- foreach ($tests as $test => $result) {
- $this->server->setBaseUri($test);
-
- $this->assertEquals($result, $this->server->getBaseUri());
-
- }
-
- }
-
- function testCalculateUri() {
-
- $uris = [
- 'http://www.example.org/root/somepath',
- '/root/somepath',
- '/root/somepath/',
- ];
-
- $this->server->setBaseUri('/root/');
-
- foreach ($uris as $uri) {
-
- $this->assertEquals('somepath', $this->server->calculateUri($uri));
-
- }
-
- $this->server->setBaseUri('/root');
-
- foreach ($uris as $uri) {
-
- $this->assertEquals('somepath', $this->server->calculateUri($uri));
-
- }
-
- $this->assertEquals('', $this->server->calculateUri('/root'));
-
- }
-
- function testCalculateUriSpecialChars() {
-
- $uris = [
- 'http://www.example.org/root/%C3%A0fo%C3%B3',
- '/root/%C3%A0fo%C3%B3',
- '/root/%C3%A0fo%C3%B3/'
- ];
-
- $this->server->setBaseUri('/root/');
-
- foreach ($uris as $uri) {
-
- $this->assertEquals("\xc3\xa0fo\xc3\xb3", $this->server->calculateUri($uri));
-
- }
-
- $this->server->setBaseUri('/root');
-
- foreach ($uris as $uri) {
-
- $this->assertEquals("\xc3\xa0fo\xc3\xb3", $this->server->calculateUri($uri));
-
- }
-
- $this->server->setBaseUri('/');
-
- foreach ($uris as $uri) {
-
- $this->assertEquals("root/\xc3\xa0fo\xc3\xb3", $this->server->calculateUri($uri));
-
- }
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\Forbidden
- */
- function testCalculateUriBreakout() {
-
- $uri = '/path1/';
-
- $this->server->setBaseUri('/path2/');
- $this->server->calculateUri($uri);
-
- }
-
- /**
- */
- function testGuessBaseUri() {
-
- $serverVars = [
- 'REQUEST_URI' => '/index.php/root',
- 'PATH_INFO' => '/root',
- ];
-
- $httpRequest = HTTP\Sapi::createFromServerArray($serverVars);
- $server = new Server();
- $server->httpRequest = $httpRequest;
-
- $this->assertEquals('/index.php/', $server->guessBaseUri());
-
- }
-
- /**
- * @depends testGuessBaseUri
- */
- function testGuessBaseUriPercentEncoding() {
-
- $serverVars = [
- 'REQUEST_URI' => '/index.php/dir/path2/path%20with%20spaces',
- 'PATH_INFO' => '/dir/path2/path with spaces',
- ];
-
- $httpRequest = HTTP\Sapi::createFromServerArray($serverVars);
- $server = new Server();
- $server->httpRequest = $httpRequest;
-
- $this->assertEquals('/index.php/', $server->guessBaseUri());
-
- }
-
- /**
- * @depends testGuessBaseUri
- */
- /*
- function testGuessBaseUriPercentEncoding2() {
-
- $this->markTestIncomplete('This behaviour is not yet implemented');
- $serverVars = [
- 'REQUEST_URI' => '/some%20directory+mixed/index.php/dir/path2/path%20with%20spaces',
- 'PATH_INFO' => '/dir/path2/path with spaces',
- ];
-
- $httpRequest = HTTP\Sapi::createFromServerArray($serverVars);
- $server = new Server();
- $server->httpRequest = $httpRequest;
-
- $this->assertEquals('/some%20directory+mixed/index.php/', $server->guessBaseUri());
-
- }*/
-
- function testGuessBaseUri2() {
-
- $serverVars = [
- 'REQUEST_URI' => '/index.php/root/',
- 'PATH_INFO' => '/root/',
- ];
-
- $httpRequest = HTTP\Sapi::createFromServerArray($serverVars);
- $server = new Server();
- $server->httpRequest = $httpRequest;
-
- $this->assertEquals('/index.php/', $server->guessBaseUri());
-
- }
-
- function testGuessBaseUriNoPathInfo() {
-
- $serverVars = [
- 'REQUEST_URI' => '/index.php/root',
- ];
-
- $httpRequest = HTTP\Sapi::createFromServerArray($serverVars);
- $server = new Server();
- $server->httpRequest = $httpRequest;
-
- $this->assertEquals('/', $server->guessBaseUri());
-
- }
-
- function testGuessBaseUriNoPathInfo2() {
-
- $serverVars = [
- 'REQUEST_URI' => '/a/b/c/test.php',
- ];
-
- $httpRequest = HTTP\Sapi::createFromServerArray($serverVars);
- $server = new Server();
- $server->httpRequest = $httpRequest;
-
- $this->assertEquals('/', $server->guessBaseUri());
-
- }
-
-
- /**
- * @depends testGuessBaseUri
- */
- function testGuessBaseUriQueryString() {
-
- $serverVars = [
- 'REQUEST_URI' => '/index.php/root?query_string=blabla',
- 'PATH_INFO' => '/root',
- ];
-
- $httpRequest = HTTP\Sapi::createFromServerArray($serverVars);
- $server = new Server();
- $server->httpRequest = $httpRequest;
-
- $this->assertEquals('/index.php/', $server->guessBaseUri());
-
- }
-
- /**
- * @depends testGuessBaseUri
- * @expectedException \Sabre\DAV\Exception
- */
- function testGuessBaseUriBadConfig() {
-
- $serverVars = [
- 'REQUEST_URI' => '/index.php/root/heyyy',
- 'PATH_INFO' => '/root',
- ];
-
- $httpRequest = HTTP\Sapi::createFromServerArray($serverVars);
- $server = new Server();
- $server->httpRequest = $httpRequest;
-
- $server->guessBaseUri();
-
- }
-
- function testTriggerException() {
-
- $serverVars = [
- 'REQUEST_URI' => '/',
- 'REQUEST_METHOD' => 'FOO',
- ];
-
- $httpRequest = HTTP\Sapi::createFromServerArray($serverVars);
- $this->server->httpRequest = $httpRequest;
- $this->server->on('beforeMethod', [$this, 'exceptionTrigger']);
- $this->server->exec();
-
- $this->assertEquals([
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $this->response->getHeaders());
-
- $this->assertEquals(500, $this->response->status);
-
- }
-
- function exceptionTrigger($request, $response) {
-
- throw new Exception('Hola');
-
- }
-
- function testReportNotFound() {
-
- $serverVars = [
- 'REQUEST_URI' => '/',
- 'REQUEST_METHOD' => 'REPORT',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $this->server->httpRequest = ($request);
- $this->server->httpRequest->setBody('<?xml version="1.0"?><bla:myreport xmlns:bla="http://www.rooftopsolutions.nl/NS"></bla:myreport>');
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ],
- $this->response->getHeaders()
- );
-
- $this->assertEquals(415, $this->response->status, 'We got an incorrect status back. Full response body follows: ' . $this->response->body);
-
- }
-
- function testReportIntercepted() {
-
- $serverVars = [
- 'REQUEST_URI' => '/',
- 'REQUEST_METHOD' => 'REPORT',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $this->server->httpRequest = ($request);
- $this->server->httpRequest->setBody('<?xml version="1.0"?><bla:myreport xmlns:bla="http://www.rooftopsolutions.nl/NS"></bla:myreport>');
- $this->server->on('report', [$this, 'reportHandler']);
- $this->server->exec();
-
- $this->assertEquals([
- 'X-Sabre-Version' => [Version::VERSION],
- 'testheader' => ['testvalue'],
- ],
- $this->response->getHeaders()
- );
-
- $this->assertEquals(418, $this->response->status, 'We got an incorrect status back. Full response body follows: ' . $this->response->body);
-
- }
-
- function reportHandler($reportName, $result, $path) {
-
- if ($reportName == '{http://www.rooftopsolutions.nl/NS}myreport') {
- $this->server->httpResponse->setStatus(418);
- $this->server->httpResponse->setHeader('testheader', 'testvalue');
- return false;
- }
- else return;
-
- }
-
- function testGetPropertiesForChildren() {
-
- $result = $this->server->getPropertiesForChildren('', [
- '{DAV:}getcontentlength',
- ]);
-
- $expected = [
- 'test.txt' => ['{DAV:}getcontentlength' => 13],
- 'dir/' => [],
- ];
-
- $this->assertEquals($expected, $result);
-
- }
-
- /**
- * There are certain cases where no HTTP status may be set. We need to
- * intercept these and set it to a default error message.
- */
- function testNoHTTPStatusSet() {
-
- $this->server->on('method:GET', function() { return false; }, 1);
- $this->server->httpRequest = new HTTP\Request('GET', '/');
- $this->server->exec();
- $this->assertEquals(500, $this->response->getStatus());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerUpdatePropertiesTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerUpdatePropertiesTest.php
deleted file mode 100644
index 383f8e657ef..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/ServerUpdatePropertiesTest.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-class ServerUpdatePropertiesTest extends \PHPUnit_Framework_TestCase {
-
- function testUpdatePropertiesFail() {
-
- $tree = [
- new SimpleCollection('foo'),
- ];
- $server = new Server($tree);
-
- $result = $server->updateProperties('foo', [
- '{DAV:}foo' => 'bar'
- ]);
-
- $expected = [
- '{DAV:}foo' => 403,
- ];
- $this->assertEquals($expected, $result);
-
- }
-
- function testUpdatePropertiesProtected() {
-
- $tree = [
- new SimpleCollection('foo'),
- ];
- $server = new Server($tree);
-
- $server->on('propPatch', function($path, PropPatch $propPatch) {
- $propPatch->handleRemaining(function() { return true; });
- });
- $result = $server->updateProperties('foo', [
- '{DAV:}getetag' => 'bla',
- '{DAV:}foo' => 'bar'
- ]);
-
- $expected = [
- '{DAV:}getetag' => 403,
- '{DAV:}foo' => 424,
- ];
- $this->assertEquals($expected, $result);
-
- }
-
- function testUpdatePropertiesEventFail() {
-
- $tree = [
- new SimpleCollection('foo'),
- ];
- $server = new Server($tree);
- $server->on('propPatch', function($path, PropPatch $propPatch) {
- $propPatch->setResultCode('{DAV:}foo', 404);
- $propPatch->handleRemaining(function() { return true; });
- });
-
- $result = $server->updateProperties('foo', [
- '{DAV:}foo' => 'bar',
- '{DAV:}foo2' => 'bla',
- ]);
-
- $expected = [
- '{DAV:}foo' => 404,
- '{DAV:}foo2' => 424,
- ];
- $this->assertEquals($expected, $result);
-
- }
-
- function testUpdatePropertiesEventSuccess() {
-
- $tree = [
- new SimpleCollection('foo'),
- ];
- $server = new Server($tree);
- $server->on('propPatch', function($path, PropPatch $propPatch) {
-
- $propPatch->handle(['{DAV:}foo', '{DAV:}foo2'], function() {
- return [
- '{DAV:}foo' => 200,
- '{DAV:}foo2' => 201,
- ];
- });
-
- });
-
- $result = $server->updateProperties('foo', [
- '{DAV:}foo' => 'bar',
- '{DAV:}foo2' => 'bla',
- ]);
-
- $expected = [
- '{DAV:}foo' => 200,
- '{DAV:}foo2' => 201,
- ];
- $this->assertEquals($expected, $result);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Sharing/PluginTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Sharing/PluginTest.php
deleted file mode 100644
index 6aa09cac072..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Sharing/PluginTest.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Sharing;
-
-use Sabre\DAV\Mock;
-use Sabre\DAV\Xml\Property;
-
-class PluginTest extends \Sabre\DAVServerTest {
-
- protected $setupSharing = true;
- protected $setupACL = true;
- protected $autoLogin = 'admin';
-
- function setUpTree() {
-
- $this->tree[] = new Mock\SharedNode(
- 'shareable',
- Plugin::ACCESS_READWRITE
- );
-
- }
-
- function testFeatures() {
-
- $this->assertEquals(
- ['resource-sharing'],
- $this->sharingPlugin->getFeatures()
- );
-
- }
-
- function testProperties() {
-
- $result = $this->server->getPropertiesForPath(
- 'shareable',
- ['{DAV:}share-access']
- );
-
- $expected = [
- [
- 200 => [
- '{DAV:}share-access' => new Property\ShareAccess(Plugin::ACCESS_READWRITE)
- ],
- 404 => [],
- 'href' => 'shareable',
- ]
- ];
-
- $this->assertEquals(
- $expected,
- $result
- );
-
- }
-
- function testGetPluginInfo() {
-
- $result = $this->sharingPlugin->getPluginInfo();
- $this->assertInternalType('array', $result);
- $this->assertEquals('sharing', $result['name']);
-
- }
-
- function testHtmlActionsPanel() {
-
- $node = new \Sabre\DAV\Mock\Collection('foo');
- $html = '';
-
- $this->assertNull(
- $this->sharingPlugin->htmlActionsPanel($node, $html, 'foo/bar')
- );
-
- $this->assertEquals(
- '',
- $html
- );
-
- $node = new \Sabre\DAV\Mock\SharedNode('foo', \Sabre\DAV\Sharing\Plugin::ACCESS_SHAREDOWNER);
- $html = '';
-
- $this->assertNull(
- $this->sharingPlugin->htmlActionsPanel($node, $html, 'shareable')
- );
- $this->assertContains(
- 'Share this resource',
- $html
- );
-
- }
-
- function testBrowserPostActionUnknownAction() {
-
- $this->assertNull($this->sharingPlugin->browserPostAction(
- 'shareable',
- 'foo',
- []
- ));
-
- }
-
- function testBrowserPostActionSuccess() {
-
- $this->assertFalse($this->sharingPlugin->browserPostAction(
- 'shareable',
- 'share',
- [
- 'access' => 'read',
- 'href' => 'mailto:foo@example.org',
- ]
- ));
-
- $expected = [
- new \Sabre\DAV\Xml\Element\Sharee([
- 'href' => 'mailto:foo@example.org',
- 'access' => \Sabre\DAV\Sharing\Plugin::ACCESS_READ,
- 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_NORESPONSE,
- ])
- ];
- $this->assertEquals(
- $expected,
- $this->tree[0]->getInvites()
- );
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\BadRequest
- */
- function testBrowserPostActionNoHref() {
-
- $this->sharingPlugin->browserPostAction(
- 'shareable',
- 'share',
- [
- 'access' => 'read',
- ]
- );
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\BadRequest
- */
- function testBrowserPostActionNoAccess() {
-
- $this->sharingPlugin->browserPostAction(
- 'shareable',
- 'share',
- [
- 'href' => 'mailto:foo@example.org',
- ]
- );
-
- }
-
-
- /**
- * @expectedException \Sabre\DAV\Exception\BadRequest
- */
- function testBrowserPostActionBadAccess() {
-
- $this->sharingPlugin->browserPostAction(
- 'shareable',
- 'share',
- [
- 'href' => 'mailto:foo@example.org',
- 'access' => 'bleed',
- ]
- );
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\Forbidden
- */
- function testBrowserPostActionAccessDenied() {
-
- $this->aclPlugin->setDefaultAcl([]);
- $this->sharingPlugin->browserPostAction(
- 'shareable',
- 'share',
- [
- 'access' => 'read',
- 'href' => 'mailto:foo@example.org',
- ]
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Sharing/ShareResourceTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Sharing/ShareResourceTest.php
deleted file mode 100644
index 959811166eb..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Sharing/ShareResourceTest.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Sharing;
-
-use Sabre\DAV\Mock;
-use Sabre\DAV\Xml\Element\Sharee;
-use Sabre\HTTP\Request;
-
-class ShareResourceTest extends \Sabre\DAVServerTest {
-
- protected $setupSharing = true;
- protected $sharingNodeMock;
-
- function setUpTree() {
-
- $this->tree[] = $this->sharingNodeMock = new Mock\SharedNode(
- 'shareable',
- Plugin::ACCESS_SHAREDOWNER
- );
-
- }
-
- function testShareResource() {
-
- $body = <<<XML
-<?xml version="1.0" encoding="utf-8" ?>
-<D:share-resource xmlns:D="DAV:">
- <D:sharee>
- <D:href>mailto:eric@example.com</D:href>
- <D:prop>
- <D:displayname>Eric York</D:displayname>
- </D:prop>
- <D:comment>Shared workspace</D:comment>
- <D:share-access>
- <D:read-write />
- </D:share-access>
- </D:sharee>
-</D:share-resource>
-XML;
- $request = new Request('POST', '/shareable', ['Content-Type' => 'application/davsharing+xml; charset="utf-8"'], $body);
-
- $response = $this->request($request);
- $this->assertEquals(200, $response->getStatus(), (string)$response->getBodyAsString());
-
- $expected = [
- new Sharee([
- 'href' => 'mailto:eric@example.com',
- 'properties' => [
- '{DAV:}displayname' => 'Eric York',
- ],
- 'access' => Plugin::ACCESS_READWRITE,
- 'comment' => 'Shared workspace',
- 'inviteStatus' => \Sabre\DAV\Sharing\Plugin::INVITE_NORESPONSE,
- ])
- ];
-
- $this->assertEquals(
- $expected,
- $this->sharingNodeMock->getInvites()
- );
-
- }
-
- /**
- * @depends testShareResource
- */
- function testShareResourceRemoveAccess() {
-
- // First we just want to execute all the actions from the first
- // test.
- $this->testShareResource();
-
- $body = <<<XML
-<?xml version="1.0" encoding="utf-8" ?>
-<D:share-resource xmlns:D="DAV:">
- <D:sharee>
- <D:href>mailto:eric@example.com</D:href>
- <D:share-access>
- <D:no-access />
- </D:share-access>
- </D:sharee>
-</D:share-resource>
-XML;
- $request = new Request('POST', '/shareable', ['Content-Type' => 'application/davsharing+xml; charset="utf-8"'], $body);
-
- $response = $this->request($request);
- $this->assertEquals(200, $response->getStatus(), (string)$response->getBodyAsString());
-
- $expected = [];
-
- $this->assertEquals(
- $expected,
- $this->sharingNodeMock->getInvites()
- );
-
-
- }
-
- /**
- * @depends testShareResource
- */
- function testShareResourceInviteProperty() {
-
- // First we just want to execute all the actions from the first
- // test.
- $this->testShareResource();
-
- $body = <<<XML
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:">
- <D:prop>
- <D:invite />
- <D:share-access />
- <D:share-resource-uri />
- </D:prop>
-</D:propfind>
-XML;
- $request = new Request('PROPFIND', '/shareable', ['Content-Type' => 'application/xml'], $body);
- $response = $this->request($request);
-
- $this->assertEquals(207, $response->getStatus());
-
- $expected = <<<XML
-<?xml version="1.0" encoding="utf-8" ?>
-<d:multistatus xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
- <d:response>
- <d:href>/shareable</d:href>
- <d:propstat>
- <d:prop>
- <d:invite>
- <d:sharee>
- <d:href>mailto:eric@example.com</d:href>
- <d:prop>
- <d:displayname>Eric York</d:displayname>
- </d:prop>
- <d:share-access><d:read-write /></d:share-access>
- <d:invite-noresponse />
- </d:sharee>
- </d:invite>
- <d:share-access><d:shared-owner /></d:share-access>
- <d:share-resource-uri><d:href>urn:example:bar</d:href></d:share-resource-uri>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
- </d:response>
-</d:multistatus>
-XML;
-
- $this->assertXmlStringEqualsXmlString($expected, $response->getBodyAsString());
-
- }
-
- function testShareResourceNotFound() {
-
- $body = <<<XML
-<?xml version="1.0" encoding="utf-8" ?>
-<D:share-resource xmlns:D="DAV:">
- <D:sharee>
- <D:href>mailto:eric@example.com</D:href>
- <D:prop>
- <D:displayname>Eric York</D:displayname>
- </D:prop>
- <D:comment>Shared workspace</D:comment>
- <D:share-access>
- <D:read-write />
- </D:share-access>
- </D:sharee>
-</D:share-resource>
-XML;
- $request = new Request('POST', '/not-found', ['Content-Type' => 'application/davsharing+xml; charset="utf-8"'], $body);
-
- $response = $this->request($request, 404);
-
- }
-
- function testShareResourceNotISharedNode() {
-
- $body = <<<XML
-<?xml version="1.0" encoding="utf-8" ?>
-<D:share-resource xmlns:D="DAV:">
- <D:sharee>
- <D:href>mailto:eric@example.com</D:href>
- <D:prop>
- <D:displayname>Eric York</D:displayname>
- </D:prop>
- <D:comment>Shared workspace</D:comment>
- <D:share-access>
- <D:read-write />
- </D:share-access>
- </D:sharee>
-</D:share-resource>
-XML;
- $request = new Request('POST', '/', ['Content-Type' => 'application/davsharing+xml; charset="utf-8"'], $body);
-
- $response = $this->request($request, 403);
-
- }
-
- function testShareResourceUnknownDoc() {
-
- $body = <<<XML
-<?xml version="1.0" encoding="utf-8" ?>
-<D:blablabla xmlns:D="DAV:" />
-XML;
- $request = new Request('POST', '/shareable', ['Content-Type' => 'application/davsharing+xml; charset="utf-8"'], $body);
- $response = $this->request($request, 400);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/SimpleFileTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/SimpleFileTest.php
deleted file mode 100644
index 15ccfaf9e36..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/SimpleFileTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-class SimpleFileTest extends \PHPUnit_Framework_TestCase {
-
- function testAll() {
-
- $file = new SimpleFile('filename.txt', 'contents', 'text/plain');
-
- $this->assertEquals('filename.txt', $file->getName());
- $this->assertEquals('contents', $file->get());
- $this->assertEquals(8, $file->getSize());
- $this->assertEquals('"' . sha1('contents') . '"', $file->getETag());
- $this->assertEquals('text/plain', $file->getContentType());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/StringUtilTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/StringUtilTest.php
deleted file mode 100644
index e98fe904884..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/StringUtilTest.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-class StringUtilTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * @param string $haystack
- * @param string $needle
- * @param string $collation
- * @param string $matchType
- * @param string $result
- * @throws Exception\BadRequest
- *
- * @dataProvider dataset
- */
- function testTextMatch($haystack, $needle, $collation, $matchType, $result) {
-
- $this->assertEquals($result, StringUtil::textMatch($haystack, $needle, $collation, $matchType));
-
- }
-
- function dataset() {
-
- return [
- ['FOOBAR', 'FOO', 'i;octet', 'contains', true],
- ['FOOBAR', 'foo', 'i;octet', 'contains', false],
- ['FÖÖBAR', 'FÖÖ', 'i;octet', 'contains', true],
- ['FÖÖBAR', 'föö', 'i;octet', 'contains', false],
- ['FOOBAR', 'FOOBAR', 'i;octet', 'equals', true],
- ['FOOBAR', 'fooBAR', 'i;octet', 'equals', false],
- ['FOOBAR', 'FOO', 'i;octet', 'starts-with', true],
- ['FOOBAR', 'foo', 'i;octet', 'starts-with', false],
- ['FOOBAR', 'BAR', 'i;octet', 'starts-with', false],
- ['FOOBAR', 'bar', 'i;octet', 'starts-with', false],
- ['FOOBAR', 'FOO', 'i;octet', 'ends-with', false],
- ['FOOBAR', 'foo', 'i;octet', 'ends-with', false],
- ['FOOBAR', 'BAR', 'i;octet', 'ends-with', true],
- ['FOOBAR', 'bar', 'i;octet', 'ends-with', false],
-
- ['FOOBAR', 'FOO', 'i;ascii-casemap', 'contains', true],
- ['FOOBAR', 'foo', 'i;ascii-casemap', 'contains', true],
- ['FÖÖBAR', 'FÖÖ', 'i;ascii-casemap', 'contains', true],
- ['FÖÖBAR', 'föö', 'i;ascii-casemap', 'contains', false],
- ['FOOBAR', 'FOOBAR', 'i;ascii-casemap', 'equals', true],
- ['FOOBAR', 'fooBAR', 'i;ascii-casemap', 'equals', true],
- ['FOOBAR', 'FOO', 'i;ascii-casemap', 'starts-with', true],
- ['FOOBAR', 'foo', 'i;ascii-casemap', 'starts-with', true],
- ['FOOBAR', 'BAR', 'i;ascii-casemap', 'starts-with', false],
- ['FOOBAR', 'bar', 'i;ascii-casemap', 'starts-with', false],
- ['FOOBAR', 'FOO', 'i;ascii-casemap', 'ends-with', false],
- ['FOOBAR', 'foo', 'i;ascii-casemap', 'ends-with', false],
- ['FOOBAR', 'BAR', 'i;ascii-casemap', 'ends-with', true],
- ['FOOBAR', 'bar', 'i;ascii-casemap', 'ends-with', true],
-
- ['FOOBAR', 'FOO', 'i;unicode-casemap', 'contains', true],
- ['FOOBAR', 'foo', 'i;unicode-casemap', 'contains', true],
- ['FÖÖBAR', 'FÖÖ', 'i;unicode-casemap', 'contains', true],
- ['FÖÖBAR', 'föö', 'i;unicode-casemap', 'contains', true],
- ['FOOBAR', 'FOOBAR', 'i;unicode-casemap', 'equals', true],
- ['FOOBAR', 'fooBAR', 'i;unicode-casemap', 'equals', true],
- ['FOOBAR', 'FOO', 'i;unicode-casemap', 'starts-with', true],
- ['FOOBAR', 'foo', 'i;unicode-casemap', 'starts-with', true],
- ['FOOBAR', 'BAR', 'i;unicode-casemap', 'starts-with', false],
- ['FOOBAR', 'bar', 'i;unicode-casemap', 'starts-with', false],
- ['FOOBAR', 'FOO', 'i;unicode-casemap', 'ends-with', false],
- ['FOOBAR', 'foo', 'i;unicode-casemap', 'ends-with', false],
- ['FOOBAR', 'BAR', 'i;unicode-casemap', 'ends-with', true],
- ['FOOBAR', 'bar', 'i;unicode-casemap', 'ends-with', true],
- ];
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\BadRequest
- */
- function testBadCollation() {
-
- StringUtil::textMatch('foobar', 'foo', 'blabla', 'contains');
-
- }
-
-
- /**
- * @expectedException Sabre\DAV\Exception\BadRequest
- */
- function testBadMatchType() {
-
- StringUtil::textMatch('foobar', 'foo', 'i;octet', 'booh');
-
- }
-
- function testEnsureUTF8_ascii() {
-
- $inputString = "harkema";
- $outputString = "harkema";
-
- $this->assertEquals(
- $outputString,
- StringUtil::ensureUTF8($inputString)
- );
-
- }
-
- function testEnsureUTF8_latin1() {
-
- $inputString = "m\xfcnster";
- $outputString = "münster";
-
- $this->assertEquals(
- $outputString,
- StringUtil::ensureUTF8($inputString)
- );
-
- }
-
- function testEnsureUTF8_utf8() {
-
- $inputString = "m\xc3\xbcnster";
- $outputString = "münster";
-
- $this->assertEquals(
- $outputString,
- StringUtil::ensureUTF8($inputString)
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Sync/MockSyncCollection.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Sync/MockSyncCollection.php
deleted file mode 100644
index aac1dee489b..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Sync/MockSyncCollection.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Sync;
-
-use Sabre\DAV;
-
-/**
- * This mocks a ISyncCollection, for unittesting.
- *
- * This object behaves the same as SimpleCollection. Call addChange to update
- * the 'changelog' that this class uses for the collection.
- *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class MockSyncCollection extends DAV\SimpleCollection implements ISyncCollection {
-
- public $changeLog = [];
-
- public $token = null;
-
- /**
- * This method returns the current sync-token for this collection.
- * This can be any string.
- *
- * If null is returned from this function, the plugin assumes there's no
- * sync information available.
- *
- * @return string|null
- */
- function getSyncToken() {
-
- // Will be 'null' in the first round, and will increment ever after.
- return $this->token;
-
- }
-
- function addChange(array $added, array $modified, array $deleted) {
-
- $this->token++;
- $this->changeLog[$this->token] = [
- 'added' => $added,
- 'modified' => $modified,
- 'deleted' => $deleted,
- ];
-
- }
-
- /**
- * The getChanges method returns all the changes that have happened, since
- * the specified syncToken and the current collection.
- *
- * This function should return an array, such as the following:
- *
- * array(
- * 'syncToken' => 'The current synctoken',
- * 'modified' => array(
- * 'new.txt',
- * ),
- * 'deleted' => array(
- * 'foo.php.bak',
- * 'old.txt'
- * )
- * );
- *
- * The syncToken property should reflect the *current* syncToken of the
- * collection, as reported getSyncToken(). This is needed here too, to
- * ensure the operation is atomic.
- *
- * If the syncToken is specified as null, this is an initial sync, and all
- * members should be reported.
- *
- * The modified property is an array of nodenames that have changed since
- * the last token.
- *
- * The deleted property is an array with nodenames, that have been deleted
- * from collection.
- *
- * The second argument is basically the 'depth' of the report. If it's 1,
- * you only have to report changes that happened only directly in immediate
- * descendants. If it's 2, it should also include changes from the nodes
- * below the child collections. (grandchildren)
- *
- * The third (optional) argument allows a client to specify how many
- * results should be returned at most. If the limit is not specified, it
- * should be treated as infinite.
- *
- * If the limit (infinite or not) is higher than you're willing to return,
- * you should throw a Sabre\DAV\Exception\TooMuchMatches() exception.
- *
- * If the syncToken is expired (due to data cleanup) or unknown, you must
- * return null.
- *
- * The limit is 'suggestive'. You are free to ignore it.
- *
- * @param string $syncToken
- * @param int $syncLevel
- * @param int $limit
- * @return array
- */
- function getChanges($syncToken, $syncLevel, $limit = null) {
-
- // This is an initial sync
- if (is_null($syncToken)) {
- return [
- 'added' => array_map(
- function($item) {
- return $item->getName();
- }, $this->getChildren()
- ),
- 'modified' => [],
- 'deleted' => [],
- 'syncToken' => $this->getSyncToken(),
- ];
- }
-
- if (!is_int($syncToken) && !ctype_digit($syncToken)) {
-
- return null;
-
- }
- if (is_null($this->token)) return null;
-
- $added = [];
- $modified = [];
- $deleted = [];
-
- foreach ($this->changeLog as $token => $change) {
-
- if ($token > $syncToken) {
-
- $added = array_merge($added, $change['added']);
- $modified = array_merge($modified, $change['modified']);
- $deleted = array_merge($deleted, $change['deleted']);
-
- if ($limit) {
- // If there's a limit, we may need to cut things off.
- // This alghorithm is weird and stupid, but it works.
- $left = $limit - (count($modified) + count($deleted));
- if ($left > 0) continue;
- if ($left === 0) break;
- if ($left < 0) {
- $modified = array_slice($modified, 0, $left);
- }
- $left = $limit - (count($modified) + count($deleted));
- if ($left === 0) break;
- if ($left < 0) {
- $deleted = array_slice($deleted, 0, $left);
- }
- break;
-
- }
-
- }
-
- }
-
- return [
- 'syncToken' => $this->token,
- 'added' => $added,
- 'modified' => $modified,
- 'deleted' => $deleted,
- ];
-
- }
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Sync/PluginTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Sync/PluginTest.php
deleted file mode 100644
index 6bcec8b7535..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Sync/PluginTest.php
+++ /dev/null
@@ -1,523 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Sync;
-
-use Sabre\DAV;
-use Sabre\HTTP;
-
-require_once __DIR__ . '/MockSyncCollection.php';
-
-class PluginTest extends \Sabre\DAVServerTest {
-
- protected $collection;
-
- function setUp() {
-
- parent::setUp();
- $this->server->addPlugin(new Plugin());
-
- }
-
- function testGetInfo() {
-
- $this->assertArrayHasKey(
- 'name',
- (new Plugin())->getPluginInfo()
- );
-
- }
-
- function setUpTree() {
-
- $this->collection =
- new MockSyncCollection('coll', [
- new DAV\SimpleFile('file1.txt', 'foo'),
- new DAV\SimpleFile('file2.txt', 'bar'),
- ]);
- $this->tree = [
- $this->collection,
- new DAV\SimpleCollection('normalcoll', [])
- ];
-
- }
-
- function testSupportedReportSet() {
-
- $result = $this->server->getProperties('/coll', ['{DAV:}supported-report-set']);
- $this->assertFalse($result['{DAV:}supported-report-set']->has('{DAV:}sync-collection'));
-
- // Making a change
- $this->collection->addChange(['file1.txt'], [], []);
-
- $result = $this->server->getProperties('/coll', ['{DAV:}supported-report-set']);
- $this->assertTrue($result['{DAV:}supported-report-set']->has('{DAV:}sync-collection'));
-
- }
-
- function testGetSyncToken() {
-
- $result = $this->server->getProperties('/coll', ['{DAV:}sync-token']);
- $this->assertFalse(isset($result['{DAV:}sync-token']));
-
- // Making a change
- $this->collection->addChange(['file1.txt'], [], []);
-
- $result = $this->server->getProperties('/coll', ['{DAV:}sync-token']);
- $this->assertTrue(isset($result['{DAV:}sync-token']));
-
- // non-sync-enabled collection
- $this->collection->addChange(['file1.txt'], [], []);
-
- $result = $this->server->getProperties('/normalcoll', ['{DAV:}sync-token']);
- $this->assertFalse(isset($result['{DAV:}sync-token']));
- }
-
- function testSyncInitialSyncCollection() {
-
- // Making a change
- $this->collection->addChange(['file1.txt'], [], []);
-
- $request = new HTTP\Request('REPORT', '/coll/', ['Content-Type' => 'application/xml']);
-
- $body = <<<BLA
-<?xml version="1.0" encoding="utf-8" ?>
-<D:sync-collection xmlns:D="DAV:">
- <D:sync-token/>
- <D:sync-level>1</D:sync-level>
- <D:prop>
- <D:getcontentlength/>
- </D:prop>
-</D:sync-collection>
-BLA;
-
- $request->setBody($body);
-
- $response = $this->request($request);
-
- $this->assertEquals(207, $response->status, 'Full response body:' . $response->body);
-
- $multiStatus = $this->server->xml->parse($response->getBodyAsString());
-
- // Checking the sync-token
- $this->assertEquals(
- 'http://sabre.io/ns/sync/1',
- $multiStatus->getSyncToken()
- );
-
- $responses = $multiStatus->getResponses();
- $this->assertEquals(2, count($responses), 'We expected exactly 2 {DAV:}response');
-
- $response = $responses[0];
-
- $this->assertNull($response->getHttpStatus());
- $this->assertEquals('/coll/file1.txt', $response->getHref());
- $this->assertEquals([
- 200 => [
- '{DAV:}getcontentlength' => 3,
- ]
- ], $response->getResponseProperties());
-
- $response = $responses[1];
-
- $this->assertNull($response->getHttpStatus());
- $this->assertEquals('/coll/file2.txt', $response->getHref());
- $this->assertEquals([
- 200 => [
- '{DAV:}getcontentlength' => 3,
- ]
- ], $response->getResponseProperties());
-
- }
-
- function testSubsequentSyncSyncCollection() {
-
- // Making a change
- $this->collection->addChange(['file1.txt'], [], []);
- // Making another change
- $this->collection->addChange([], ['file2.txt'], ['file3.txt']);
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'REPORT',
- 'REQUEST_URI' => '/coll/',
- 'CONTENT_TYPE' => 'application/xml',
- ]);
-
- $body = <<<BLA
-<?xml version="1.0" encoding="utf-8" ?>
-<D:sync-collection xmlns:D="DAV:">
- <D:sync-token>http://sabre.io/ns/sync/1</D:sync-token>
- <D:sync-level>infinite</D:sync-level>
- <D:prop>
- <D:getcontentlength/>
- </D:prop>
-</D:sync-collection>
-BLA;
-
- $request->setBody($body);
-
- $response = $this->request($request);
-
- $this->assertEquals(207, $response->status, 'Full response body:' . $response->body);
-
- $multiStatus = $this->server->xml->parse($response->getBodyAsString());
-
- // Checking the sync-token
- $this->assertEquals(
- 'http://sabre.io/ns/sync/2',
- $multiStatus->getSyncToken()
- );
-
- $responses = $multiStatus->getResponses();
- $this->assertEquals(2, count($responses), 'We expected exactly 2 {DAV:}response');
-
- $response = $responses[0];
-
- $this->assertNull($response->getHttpStatus());
- $this->assertEquals('/coll/file2.txt', $response->getHref());
- $this->assertEquals([
- 200 => [
- '{DAV:}getcontentlength' => 3,
- ]
- ], $response->getResponseProperties());
-
- $response = $responses[1];
-
- $this->assertEquals('404', $response->getHttpStatus());
- $this->assertEquals('/coll/file3.txt', $response->getHref());
- $this->assertEquals([], $response->getResponseProperties());
-
- }
-
- function testSubsequentSyncSyncCollectionLimit() {
-
- // Making a change
- $this->collection->addChange(['file1.txt'], [], []);
- // Making another change
- $this->collection->addChange([], ['file2.txt'], ['file3.txt']);
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'REPORT',
- 'REQUEST_URI' => '/coll/',
- 'CONTENT_TYPE' => 'application/xml',
- ]);
-
- $body = <<<BLA
-<?xml version="1.0" encoding="utf-8" ?>
-<D:sync-collection xmlns:D="DAV:">
- <D:sync-token>http://sabre.io/ns/sync/1</D:sync-token>
- <D:sync-level>infinite</D:sync-level>
- <D:prop>
- <D:getcontentlength/>
- </D:prop>
- <D:limit><D:nresults>1</D:nresults></D:limit>
-</D:sync-collection>
-BLA;
-
- $request->setBody($body);
-
- $response = $this->request($request);
-
- $this->assertEquals(207, $response->status, 'Full response body:' . $response->body);
-
- $multiStatus = $this->server->xml->parse(
- $response->getBodyAsString()
- );
-
- // Checking the sync-token
- $this->assertEquals(
- 'http://sabre.io/ns/sync/2',
- $multiStatus->getSyncToken()
- );
-
- $responses = $multiStatus->getResponses();
- $this->assertEquals(1, count($responses), 'We expected exactly 1 {DAV:}response');
-
- $response = $responses[0];
-
- $this->assertEquals('404', $response->getHttpStatus());
- $this->assertEquals('/coll/file3.txt', $response->getHref());
- $this->assertEquals([], $response->getResponseProperties());
-
- }
-
- function testSubsequentSyncSyncCollectionDepthFallBack() {
-
- // Making a change
- $this->collection->addChange(['file1.txt'], [], []);
- // Making another change
- $this->collection->addChange([], ['file2.txt'], ['file3.txt']);
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'REPORT',
- 'REQUEST_URI' => '/coll/',
- 'CONTENT_TYPE' => 'application/xml',
- 'HTTP_DEPTH' => "1",
- ]);
-
- $body = <<<BLA
-<?xml version="1.0" encoding="utf-8" ?>
-<D:sync-collection xmlns:D="DAV:">
- <D:sync-token>http://sabre.io/ns/sync/1</D:sync-token>
- <D:prop>
- <D:getcontentlength/>
- </D:prop>
-</D:sync-collection>
-BLA;
-
- $request->setBody($body);
-
- $response = $this->request($request);
-
- $this->assertEquals(207, $response->status, 'Full response body:' . $response->body);
-
- $multiStatus = $this->server->xml->parse(
- $response->getBodyAsString()
- );
-
- // Checking the sync-token
- $this->assertEquals(
- 'http://sabre.io/ns/sync/2',
- $multiStatus->getSyncToken()
- );
-
- $responses = $multiStatus->getResponses();
- $this->assertEquals(2, count($responses), 'We expected exactly 2 {DAV:}response');
-
- $response = $responses[0];
-
- $this->assertNull($response->getHttpStatus());
- $this->assertEquals('/coll/file2.txt', $response->getHref());
- $this->assertEquals([
- 200 => [
- '{DAV:}getcontentlength' => 3,
- ]
- ], $response->getResponseProperties());
-
- $response = $responses[1];
-
- $this->assertEquals('404', $response->getHttpStatus());
- $this->assertEquals('/coll/file3.txt', $response->getHref());
- $this->assertEquals([], $response->getResponseProperties());
-
- }
-
- function testSyncNoSyncInfo() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'REPORT',
- 'REQUEST_URI' => '/coll/',
- 'CONTENT_TYPE' => 'application/xml',
- ]);
-
- $body = <<<BLA
-<?xml version="1.0" encoding="utf-8" ?>
-<D:sync-collection xmlns:D="DAV:">
- <D:sync-token/>
- <D:sync-level>1</D:sync-level>
- <D:prop>
- <D:getcontentlength/>
- </D:prop>
-</D:sync-collection>
-BLA;
-
- $request->setBody($body);
-
- $response = $this->request($request);
-
- // The default state has no sync-token, so this report should not yet
- // be supported.
- $this->assertEquals(415, $response->status, 'Full response body:' . $response->body);
-
- }
-
- function testSyncNoSyncCollection() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'REPORT',
- 'REQUEST_URI' => '/normalcoll/',
- 'CONTENT_TYPE' => 'application/xml',
- ]);
-
- $body = <<<BLA
-<?xml version="1.0" encoding="utf-8" ?>
-<D:sync-collection xmlns:D="DAV:">
- <D:sync-token/>
- <D:sync-level>1</D:sync-level>
- <D:prop>
- <D:getcontentlength/>
- </D:prop>
-</D:sync-collection>
-BLA;
-
- $request->setBody($body);
-
- $response = $this->request($request);
-
- // The default state has no sync-token, so this report should not yet
- // be supported.
- $this->assertEquals(415, $response->status, 'Full response body:' . $response->body);
-
- }
-
- function testSyncInvalidToken() {
-
- $this->collection->addChange(['file1.txt'], [], []);
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'REPORT',
- 'REQUEST_URI' => '/coll/',
- 'CONTENT_TYPE' => 'application/xml',
- ]);
-
- $body = <<<BLA
-<?xml version="1.0" encoding="utf-8" ?>
-<D:sync-collection xmlns:D="DAV:">
- <D:sync-token>http://sabre.io/ns/sync/invalid</D:sync-token>
- <D:sync-level>1</D:sync-level>
- <D:prop>
- <D:getcontentlength/>
- </D:prop>
-</D:sync-collection>
-BLA;
-
- $request->setBody($body);
-
- $response = $this->request($request);
-
- // The default state has no sync-token, so this report should not yet
- // be supported.
- $this->assertEquals(403, $response->status, 'Full response body:' . $response->body);
-
- }
- function testSyncInvalidTokenNoPrefix() {
-
- $this->collection->addChange(['file1.txt'], [], []);
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'REPORT',
- 'REQUEST_URI' => '/coll/',
- 'CONTENT_TYPE' => 'application/xml',
- ]);
-
- $body = <<<BLA
-<?xml version="1.0" encoding="utf-8" ?>
-<D:sync-collection xmlns:D="DAV:">
- <D:sync-token>invalid</D:sync-token>
- <D:sync-level>1</D:sync-level>
- <D:prop>
- <D:getcontentlength/>
- </D:prop>
-</D:sync-collection>
-BLA;
-
- $request->setBody($body);
-
- $response = $this->request($request);
-
- // The default state has no sync-token, so this report should not yet
- // be supported.
- $this->assertEquals(403, $response->status, 'Full response body:' . $response->body);
-
- }
-
- function testSyncNoSyncToken() {
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'REPORT',
- 'REQUEST_URI' => '/coll/',
- 'CONTENT_TYPE' => 'application/xml',
- ]);
-
- $body = <<<BLA
-<?xml version="1.0" encoding="utf-8" ?>
-<D:sync-collection xmlns:D="DAV:">
- <D:sync-level>1</D:sync-level>
- <D:prop>
- <D:getcontentlength/>
- </D:prop>
-</D:sync-collection>
-BLA;
-
- $request->setBody($body);
-
- $response = $this->request($request);
-
- // The default state has no sync-token, so this report should not yet
- // be supported.
- $this->assertEquals(400, $response->status, 'Full response body:' . $response->body);
-
- }
-
- function testSyncNoProp() {
-
- $this->collection->addChange(['file1.txt'], [], []);
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'REPORT',
- 'REQUEST_URI' => '/coll/',
- 'CONTENT_TYPE' => 'application/xml',
- ]);
-
- $body = <<<BLA
-<?xml version="1.0" encoding="utf-8" ?>
-<D:sync-collection xmlns:D="DAV:">
- <D:sync-token />
- <D:sync-level>1</D:sync-level>
-</D:sync-collection>
-BLA;
-
- $request->setBody($body);
-
- $response = $this->request($request);
-
- // The default state has no sync-token, so this report should not yet
- // be supported.
- $this->assertEquals(400, $response->status, 'Full response body:' . $response->body);
-
- }
-
- function testIfConditions() {
-
- $this->collection->addChange(['file1.txt'], [], []);
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'DELETE',
- 'REQUEST_URI' => '/coll/file1.txt',
- 'HTTP_IF' => '</coll> (<http://sabre.io/ns/sync/1>)',
- ]);
- $response = $this->request($request);
-
- // If a 403 is thrown this works correctly. The file in questions
- // doesn't allow itself to be deleted.
- // If the If conditions failed, it would have been a 412 instead.
- $this->assertEquals(403, $response->status);
-
- }
-
- function testIfConditionsNot() {
-
- $this->collection->addChange(['file1.txt'], [], []);
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'DELETE',
- 'REQUEST_URI' => '/coll/file1.txt',
- 'HTTP_IF' => '</coll> (Not <http://sabre.io/ns/sync/2>)',
- ]);
- $response = $this->request($request);
-
- // If a 403 is thrown this works correctly. The file in questions
- // doesn't allow itself to be deleted.
- // If the If conditions failed, it would have been a 412 instead.
- $this->assertEquals(403, $response->status);
-
- }
-
- function testIfConditionsNoSyncToken() {
-
- $this->collection->addChange(['file1.txt'], [], []);
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'DELETE',
- 'REQUEST_URI' => '/coll/file1.txt',
- 'HTTP_IF' => '</coll> (<opaquelocktoken:foo>)',
- ]);
- $response = $this->request($request);
-
- $this->assertEquals(412, $response->status);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/SyncTokenPropertyTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/SyncTokenPropertyTest.php
deleted file mode 100644
index ff139f78c41..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/SyncTokenPropertyTest.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-class SyncTokenPropertyTest extends \Sabre\DAVServerTest {
-
- /**
- * The assumption in these tests is that a PROPFIND is going on, and to
- * fetch the sync-token, the event handler is just able to use the existing
- * result.
- *
- * @param string $name
- * @param mixed $value
- *
- * @dataProvider data
- */
- function testAlreadyThere1($name, $value) {
-
- $propFind = new PropFind('foo', [
- '{http://calendarserver.org/ns/}getctag',
- $name,
- ]);
-
- $propFind->set($name, $value);
- $corePlugin = new CorePlugin();
- $corePlugin->propFindLate($propFind, new SimpleCollection('hi'));
-
- $this->assertEquals("hello", $propFind->get('{http://calendarserver.org/ns/}getctag'));
-
- }
-
- /**
- * In these test-cases, the plugin is forced to do a local propfind to
- * fetch the items.
- *
- * @param string $name
- * @param mixed $value
- *
- * @dataProvider data
- */
- function testRefetch($name, $value) {
-
- $this->server->tree = new Tree(
- new SimpleCollection('root', [
- new Mock\PropertiesCollection(
- 'foo',
- [],
- [$name => $value]
- )
- ])
- );
- $propFind = new PropFind('foo', [
- '{http://calendarserver.org/ns/}getctag',
- $name,
- ]);
-
- $corePlugin = $this->server->getPlugin('core');
- $corePlugin->propFindLate($propFind, new SimpleCollection('hi'));
-
- $this->assertEquals("hello", $propFind->get('{http://calendarserver.org/ns/}getctag'));
-
- }
-
- function testNoData() {
-
- $this->server->tree = new Tree(
- new SimpleCollection('root', [
- new Mock\PropertiesCollection(
- 'foo',
- [],
- []
- )
- ])
- );
-
- $propFind = new PropFind('foo', [
- '{http://calendarserver.org/ns/}getctag',
- ]);
-
- $corePlugin = $this->server->getPlugin('core');
- $corePlugin->propFindLate($propFind, new SimpleCollection('hi'));
-
- $this->assertNull($propFind->get('{http://calendarserver.org/ns/}getctag'));
-
- }
-
- function data() {
-
- return [
- [
- '{http://sabredav.org/ns}sync-token',
- "hello"
- ],
- [
- '{DAV:}sync-token',
- "hello"
- ],
- [
- '{DAV:}sync-token',
- new Xml\Property\Href(Sync\Plugin::SYNCTOKEN_PREFIX . "hello", false)
- ]
- ];
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/TemporaryFileFilterTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/TemporaryFileFilterTest.php
deleted file mode 100644
index 6acd6b077b8..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/TemporaryFileFilterTest.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\HTTP;
-
-class TemporaryFileFilterTest extends AbstractServer {
-
- function setUp() {
-
- parent::setUp();
- $plugin = new TemporaryFileFilterPlugin(SABRE_TEMPDIR . '/tff');
- $this->server->addPlugin($plugin);
-
- }
-
- function testPutNormal() {
-
- $request = new HTTP\Request('PUT', '/testput.txt', [], 'Testing new file');
-
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals('', $this->response->body);
- $this->assertEquals(201, $this->response->status);
- $this->assertEquals('0', $this->response->getHeader('Content-Length'));
-
- $this->assertEquals('Testing new file', file_get_contents(SABRE_TEMPDIR . '/testput.txt'));
-
- }
-
- function testPutTemp() {
-
- // mimicking an OS/X resource fork
- $request = new HTTP\Request('PUT', '/._testput.txt', [], 'Testing new file');
-
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals('', $this->response->body);
- $this->assertEquals(201, $this->response->status);
- $this->assertEquals([
- 'X-Sabre-Temp' => ['true'],
- ], $this->response->getHeaders());
-
- $this->assertFalse(file_exists(SABRE_TEMPDIR . '/._testput.txt'), '._testput.txt should not exist in the regular file structure.');
-
- }
-
- function testPutTempIfNoneMatch() {
-
- // mimicking an OS/X resource fork
- $request = new HTTP\Request('PUT', '/._testput.txt', ['If-None-Match' => '*'], 'Testing new file');
-
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals('', $this->response->body);
- $this->assertEquals(201, $this->response->status);
- $this->assertEquals([
- 'X-Sabre-Temp' => ['true'],
- ], $this->response->getHeaders());
-
- $this->assertFalse(file_exists(SABRE_TEMPDIR . '/._testput.txt'), '._testput.txt should not exist in the regular file structure.');
-
-
- $this->server->exec();
-
- $this->assertEquals(412, $this->response->status);
- $this->assertEquals([
- 'X-Sabre-Temp' => ['true'],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $this->response->getHeaders());
-
- }
-
- function testPutGet() {
-
- // mimicking an OS/X resource fork
- $request = new HTTP\Request('PUT', '/._testput.txt', [], 'Testing new file');
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals('', $this->response->body);
- $this->assertEquals(201, $this->response->status);
- $this->assertEquals([
- 'X-Sabre-Temp' => ['true'],
- ], $this->response->getHeaders());
-
- $request = new HTTP\Request('GET', '/._testput.txt');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(200, $this->response->status);
- $this->assertEquals([
- 'X-Sabre-Temp' => ['true'],
- 'Content-Length' => [16],
- 'Content-Type' => ['application/octet-stream'],
- ], $this->response->getHeaders());
-
- $this->assertEquals('Testing new file', stream_get_contents($this->response->body));
-
- }
-
- function testLockNonExistant() {
-
- mkdir(SABRE_TEMPDIR . '/locksdir');
- $locksBackend = new Locks\Backend\File(SABRE_TEMPDIR . '/locks');
- $locksPlugin = new Locks\Plugin($locksBackend);
- $this->server->addPlugin($locksPlugin);
-
- // mimicking an OS/X resource fork
- $request = new HTTP\Request('LOCK', '/._testput.txt');
- $request->setBody('<?xml version="1.0"?>
-<D:lockinfo xmlns:D="DAV:">
- <D:lockscope><D:exclusive/></D:lockscope>
- <D:locktype><D:write/></D:locktype>
- <D:owner>
- <D:href>http://example.org/~ejw/contact.html</D:href>
- </D:owner>
-</D:lockinfo>');
-
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals(201, $this->response->status);
- $this->assertEquals('application/xml; charset=utf-8', $this->response->getHeader('Content-Type'));
- $this->assertTrue(preg_match('/^<opaquelocktoken:(.*)>$/', $this->response->getHeader('Lock-Token')) === 1, 'We did not get a valid Locktoken back (' . $this->response->getHeader('Lock-Token') . ')');
- $this->assertEquals('true', $this->response->getHeader('X-Sabre-Temp'));
-
- $this->assertFalse(file_exists(SABRE_TEMPDIR . '/._testlock.txt'), '._testlock.txt should not exist in the regular file structure.');
-
- }
-
- function testPutDelete() {
-
- // mimicking an OS/X resource fork
- $request = new HTTP\Request('PUT', '/._testput.txt', [], 'Testing new file');
-
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('', $this->response->body);
- $this->assertEquals(201, $this->response->status);
- $this->assertEquals([
- 'X-Sabre-Temp' => ['true'],
- ], $this->response->getHeaders());
-
- $request = new HTTP\Request('DELETE', '/._testput.txt');
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals(204, $this->response->status, "Incorrect status code received. Full body:\n" . $this->response->body);
- $this->assertEquals([
- 'X-Sabre-Temp' => ['true'],
- ], $this->response->getHeaders());
-
- $this->assertEquals('', $this->response->body);
-
- }
-
- function testPutPropfind() {
-
- // mimicking an OS/X resource fork
- $request = new HTTP\Request('PUT', '/._testput.txt', [], 'Testing new file');
- $this->server->httpRequest = $request;
- $this->server->exec();
-
- $this->assertEquals('', $this->response->body);
- $this->assertEquals(201, $this->response->status);
- $this->assertEquals([
- 'X-Sabre-Temp' => ['true'],
- ], $this->response->getHeaders());
-
- $request = new HTTP\Request('PROPFIND', '/._testput.txt');
-
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- $this->assertEquals(207, $this->response->status, 'Incorrect status code returned. Body: ' . $this->response->body);
- $this->assertEquals([
- 'X-Sabre-Temp' => ['true'],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $this->response->getHeaders());
-
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", "xmlns\\1=\"urn:DAV\"", $this->response->body);
- $xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d', 'urn:DAV');
-
- list($data) = $xml->xpath('/d:multistatus/d:response/d:href');
- $this->assertEquals('/._testput.txt', (string)$data, 'href element should have been /._testput.txt');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:resourcetype');
- $this->assertEquals(1, count($data));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/TestPlugin.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/TestPlugin.php
deleted file mode 100644
index 619ac03fd73..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/TestPlugin.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-use Sabre\HTTP\RequestInterface;
-use Sabre\HTTP\ResponseInterface;
-
-class TestPlugin extends ServerPlugin {
-
- public $beforeMethod;
-
- function getFeatures() {
-
- return ['drinking'];
-
- }
-
- function getHTTPMethods($uri) {
-
- return ['BEER','WINE'];
-
- }
-
- function initialize(Server $server) {
-
- $server->on('beforeMethod', [$this, 'beforeMethod']);
-
- }
-
- function beforeMethod(RequestInterface $request, ResponseInterface $response) {
-
- $this->beforeMethod = $request->getMethod();
- return true;
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/TreeTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/TreeTest.php
deleted file mode 100644
index e719e38d59d..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/TreeTest.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-class TreeTest extends \PHPUnit_Framework_TestCase {
-
- function testNodeExists() {
-
- $tree = new TreeMock();
-
- $this->assertTrue($tree->nodeExists('hi'));
- $this->assertFalse($tree->nodeExists('hello'));
-
- }
-
- function testCopy() {
-
- $tree = new TreeMock();
- $tree->copy('hi', 'hi2');
-
- $this->assertArrayHasKey('hi2', $tree->getNodeForPath('')->newDirectories);
- $this->assertEquals('foobar', $tree->getNodeForPath('hi/file')->get());
- $this->assertEquals(['test1' => 'value'], $tree->getNodeForPath('hi/file')->getProperties([]));
-
- }
-
- function testMove() {
-
- $tree = new TreeMock();
- $tree->move('hi', 'hi2');
-
- $this->assertEquals('hi2', $tree->getNodeForPath('hi')->getName());
- $this->assertTrue($tree->getNodeForPath('hi')->isRenamed);
-
- }
-
- function testDeepMove() {
-
- $tree = new TreeMock();
- $tree->move('hi/sub', 'hi2');
-
- $this->assertArrayHasKey('hi2', $tree->getNodeForPath('')->newDirectories);
- $this->assertTrue($tree->getNodeForPath('hi/sub')->isDeleted);
-
- }
-
- function testDelete() {
-
- $tree = new TreeMock();
- $tree->delete('hi');
- $this->assertTrue($tree->getNodeForPath('hi')->isDeleted);
-
- }
-
- function testGetChildren() {
-
- $tree = new TreeMock();
- $children = $tree->getChildren('');
- $this->assertEquals(2, count($children));
- $this->assertEquals('hi', $children[0]->getName());
-
- }
-
- function testGetMultipleNodes() {
-
- $tree = new TreeMock();
- $result = $tree->getMultipleNodes(['hi/sub', 'hi/file']);
- $this->assertArrayHasKey('hi/sub', $result);
- $this->assertArrayHasKey('hi/file', $result);
-
- $this->assertEquals('sub', $result['hi/sub']->getName());
- $this->assertEquals('file', $result['hi/file']->getName());
-
- }
- function testGetMultipleNodes2() {
-
- $tree = new TreeMock();
- $result = $tree->getMultipleNodes(['multi/1', 'multi/2']);
- $this->assertArrayHasKey('multi/1', $result);
- $this->assertArrayHasKey('multi/2', $result);
-
- }
-
-}
-
-class TreeMock extends Tree {
-
- private $nodes = [];
-
- function __construct() {
-
- $file = new TreeFileTester('file');
- $file->properties = ['test1' => 'value'];
- $file->data = 'foobar';
-
- parent::__construct(
- new TreeDirectoryTester('root', [
- new TreeDirectoryTester('hi', [
- new TreeDirectoryTester('sub'),
- $file,
- ]),
- new TreeMultiGetTester('multi', [
- new TreeFileTester('1'),
- new TreeFileTester('2'),
- new TreeFileTester('3'),
- ])
- ])
- );
-
- }
-
-}
-
-class TreeDirectoryTester extends SimpleCollection {
-
- public $newDirectories = [];
- public $newFiles = [];
- public $isDeleted = false;
- public $isRenamed = false;
-
- function createDirectory($name) {
-
- $this->newDirectories[$name] = true;
-
- }
-
- function createFile($name, $data = null) {
-
- $this->newFiles[$name] = $data;
-
- }
-
- function getChild($name) {
-
- if (isset($this->newDirectories[$name])) return new self($name);
- if (isset($this->newFiles[$name])) return new TreeFileTester($name, $this->newFiles[$name]);
- return parent::getChild($name);
-
- }
-
- function childExists($name) {
-
- return !!$this->getChild($name);
-
- }
-
- function delete() {
-
- $this->isDeleted = true;
-
- }
-
- function setName($name) {
-
- $this->isRenamed = true;
- $this->name = $name;
-
- }
-
-}
-
-class TreeFileTester extends File implements IProperties {
-
- public $name;
- public $data;
- public $properties;
-
- function __construct($name, $data = null) {
-
- $this->name = $name;
- if (is_null($data)) $data = 'bla';
- $this->data = $data;
-
- }
-
- function getName() {
-
- return $this->name;
-
- }
-
- function get() {
-
- return $this->data;
-
- }
-
- function getProperties($properties) {
-
- return $this->properties;
-
- }
-
- /**
- * Updates properties on this node.
- *
- * This method received a PropPatch object, which contains all the
- * information about the update.
- *
- * To update specific properties, call the 'handle' method on this object.
- * Read the PropPatch documentation for more information.
- *
- * @param PropPatch $propPatch
- * @return void
- */
- function propPatch(PropPatch $propPatch) {
-
- $this->properties = $propPatch->getMutations();
- $propPatch->setRemainingResultCode(200);
-
- }
-
-}
-
-class TreeMultiGetTester extends TreeDirectoryTester implements IMultiGet {
-
- /**
- * This method receives a list of paths in it's first argument.
- * It must return an array with Node objects.
- *
- * If any children are not found, you do not have to return them.
- *
- * @param array $paths
- * @return array
- */
- function getMultipleChildren(array $paths) {
-
- $result = [];
- foreach ($paths as $path) {
- try {
- $child = $this->getChild($path);
- $result[] = $child;
- } catch (Exception\NotFound $e) {
- // Do nothing
- }
- }
-
- return $result;
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/UUIDUtilTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/UUIDUtilTest.php
deleted file mode 100644
index f005ecc75f0..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/UUIDUtilTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Sabre\DAV;
-
-class UUIDUtilTest extends \PHPUnit_Framework_TestCase {
-
- function testValidateUUID() {
-
- $this->assertTrue(
- UUIDUtil::validateUUID('11111111-2222-3333-4444-555555555555')
- );
- $this->assertFalse(
- UUIDUtil::validateUUID(' 11111111-2222-3333-4444-555555555555')
- );
- $this->assertTrue(
- UUIDUtil::validateUUID('ffffffff-2222-3333-4444-555555555555')
- );
- $this->assertFalse(
- UUIDUtil::validateUUID('fffffffg-2222-3333-4444-555555555555')
- );
-
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Element/PropTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Element/PropTest.php
deleted file mode 100644
index 7cc10650cba..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Element/PropTest.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Xml\Element;
-
-use Sabre\DAV\Xml\Property\Complex;
-use Sabre\DAV\Xml\Property\Href;
-use Sabre\DAV\Xml\XmlTest;
-
-class PropTest extends XmlTest {
-
- function testDeserializeSimple() {
-
- $input = <<<XML
-<?xml version="1.0"?>
-<root xmlns="DAV:">
- <foo>bar</foo>
-</root>
-XML;
-
- $expected = [
- '{DAV:}foo' => 'bar',
- ];
-
- $this->assertDecodeProp($input, $expected);
-
- }
- function testDeserializeEmpty() {
-
- $input = <<<XML
-<?xml version="1.0"?>
-<root xmlns="DAV:" />
-XML;
-
- $expected = [
- ];
-
- $this->assertDecodeProp($input, $expected);
-
- }
- function testDeserializeComplex() {
-
- $input = <<<XML
-<?xml version="1.0"?>
-<root xmlns="DAV:">
- <foo><no>yes</no></foo>
-</root>
-XML;
-
- $expected = [
- '{DAV:}foo' => new Complex('<no xmlns="DAV:">yes</no>')
- ];
-
- $this->assertDecodeProp($input, $expected);
-
- }
- function testDeserializeCustom() {
-
- $input = <<<XML
-<?xml version="1.0"?>
-<root xmlns="DAV:">
- <foo><href>/hello</href></foo>
-</root>
-XML;
-
- $expected = [
- '{DAV:}foo' => new Href('/hello', false)
- ];
-
- $elementMap = [
- '{DAV:}foo' => 'Sabre\DAV\Xml\Property\Href'
- ];
-
- $this->assertDecodeProp($input, $expected, $elementMap);
-
- }
- function testDeserializeCustomCallback() {
-
- $input = <<<XML
-<?xml version="1.0"?>
-<root xmlns="DAV:">
- <foo>blabla</foo>
-</root>
-XML;
-
- $expected = [
- '{DAV:}foo' => 'zim',
- ];
-
- $elementMap = [
- '{DAV:}foo' => function($reader) {
- $reader->next();
- return 'zim';
- }
- ];
-
- $this->assertDecodeProp($input, $expected, $elementMap);
-
- }
-
- /**
- * @expectedException \LogicException
- */
- function testDeserializeCustomBad() {
-
- $input = <<<XML
-<?xml version="1.0"?>
-<root xmlns="DAV:">
- <foo>blabla</foo>
-</root>
-XML;
-
- $expected = [];
-
- $elementMap = [
- '{DAV:}foo' => 'idk?',
- ];
-
- $this->assertDecodeProp($input, $expected, $elementMap);
-
- }
-
- /**
- * @expectedException \LogicException
- */
- function testDeserializeCustomBadObj() {
-
- $input = <<<XML
-<?xml version="1.0"?>
-<root xmlns="DAV:">
- <foo>blabla</foo>
-</root>
-XML;
-
- $expected = [];
-
- $elementMap = [
- '{DAV:}foo' => new \StdClass(),
- ];
-
- $this->assertDecodeProp($input, $expected, $elementMap);
-
- }
-
- function assertDecodeProp($input, array $expected, array $elementMap = []) {
-
- $elementMap['{DAV:}root'] = 'Sabre\DAV\Xml\Element\Prop';
-
- $result = $this->parse($input, $elementMap);
- $this->assertInternalType('array', $result);
- $this->assertEquals($expected, $result['value']);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Element/ResponseTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Element/ResponseTest.php
deleted file mode 100644
index f19e7df7c0c..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Element/ResponseTest.php
+++ /dev/null
@@ -1,313 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Xml\Element;
-
-use Sabre\DAV;
-
-class ResponseTest extends DAV\Xml\XmlTest {
-
- function testSimple() {
-
- $innerProps = [
- 200 => [
- '{DAV:}displayname' => 'my file',
- ],
- 404 => [
- '{DAV:}owner' => null,
- ]
- ];
-
- $property = new Response('uri', $innerProps);
-
- $this->assertEquals('uri', $property->getHref());
- $this->assertEquals($innerProps, $property->getResponseProperties());
-
-
- }
-
- /**
- * @depends testSimple
- */
- function testSerialize() {
-
- $innerProps = [
- 200 => [
- '{DAV:}displayname' => 'my file',
- ],
- 404 => [
- '{DAV:}owner' => null,
- ]
- ];
-
- $property = new Response('uri', $innerProps);
-
- $xml = $this->write(['{DAV:}root' => ['{DAV:}response' => $property]]);
-
- $this->assertXmlStringEqualsXmlString(
-'<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:response>
- <d:href>/uri</d:href>
- <d:propstat>
- <d:prop>
- <d:displayname>my file</d:displayname>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
- <d:propstat>
- <d:prop>
- <d:owner/>
- </d:prop>
- <d:status>HTTP/1.1 404 Not Found</d:status>
- </d:propstat>
- </d:response>
-</d:root>
-', $xml);
-
- }
-
- /**
- * This one is specifically for testing properties with no namespaces, which is legal xml
- *
- * @depends testSerialize
- */
- function testSerializeEmptyNamespace() {
-
- $innerProps = [
- 200 => [
- '{}propertyname' => 'value',
- ],
- ];
-
- $property = new Response('uri', $innerProps);
-
- $xml = $this->write(['{DAV:}root' => ['{DAV:}response' => $property]]);
-
- $this->assertEquals(
-'<d:root xmlns:d="DAV:">
- <d:response>
- <d:href>/uri</d:href>
- <d:propstat>
- <d:prop>
- <propertyname xmlns="">value</propertyname>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
- </d:response>
-</d:root>
-', $xml);
-
- }
-
- /**
- * This one is specifically for testing properties with no namespaces, which is legal xml
- *
- * @depends testSerialize
- */
- function testSerializeCustomNamespace() {
-
- $innerProps = [
- 200 => [
- '{http://sabredav.org/NS/example}propertyname' => 'value',
- ],
- ];
-
- $property = new Response('uri', $innerProps);
- $xml = $this->write(['{DAV:}root' => ['{DAV:}response' => $property]]);
-
- $this->assertXmlStringEqualsXmlString(
-'<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:response>
- <d:href>/uri</d:href>
- <d:propstat>
- <d:prop>
- <x1:propertyname xmlns:x1="http://sabredav.org/NS/example">value</x1:propertyname>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
- </d:response>
-</d:root>', $xml);
-
- }
-
- /**
- * @depends testSerialize
- */
- function testSerializeComplexProperty() {
-
- $innerProps = [
- 200 => [
- '{DAV:}link' => new DAV\Xml\Property\Href('http://sabredav.org/', false)
- ],
- ];
-
- $property = new Response('uri', $innerProps);
- $xml = $this->write(['{DAV:}root' => ['{DAV:}response' => $property]]);
-
- $this->assertXmlStringEqualsXmlString(
-'<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:response>
- <d:href>/uri</d:href>
- <d:propstat>
- <d:prop>
- <d:link><d:href>http://sabredav.org/</d:href></d:link>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
- </d:response>
-</d:root>
-', $xml);
-
- }
-
- /**
- * @depends testSerialize
- * @expectedException \InvalidArgumentException
- */
- function testSerializeBreak() {
-
- $innerProps = [
- 200 => [
- '{DAV:}link' => new \STDClass()
- ],
- ];
-
- $property = new Response('uri', $innerProps);
- $this->write(['{DAV:}root' => ['{DAV:}response' => $property]]);
-
- }
-
- function testDeserializeComplexProperty() {
-
- $xml = '<?xml version="1.0"?>
-<d:response xmlns:d="DAV:">
- <d:href>/uri</d:href>
- <d:propstat>
- <d:prop>
- <d:foo>hello</d:foo>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
-</d:response>
-';
-
- $result = $this->parse($xml, [
- '{DAV:}response' => 'Sabre\DAV\Xml\Element\Response',
- '{DAV:}foo' => function($reader) {
-
- $reader->next();
- return 'world';
- },
- ]);
- $this->assertEquals(
- new Response('/uri', [
- '200' => [
- '{DAV:}foo' => 'world',
- ]
- ]),
- $result['value']
- );
-
- }
-
- /**
- * @depends testSimple
- */
- function testSerializeUrlencoding() {
-
- $innerProps = [
- 200 => [
- '{DAV:}displayname' => 'my file',
- ],
- ];
-
- $property = new Response('space here', $innerProps);
-
- $xml = $this->write(['{DAV:}root' => ['{DAV:}response' => $property]]);
-
- $this->assertXmlStringEqualsXmlString(
-'<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:response>
- <d:href>/space%20here</d:href>
- <d:propstat>
- <d:prop>
- <d:displayname>my file</d:displayname>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
- </d:response>
-</d:root>
-', $xml);
-
- }
-
- /**
- * @depends testSerialize
- *
- * The WebDAV spec _requires_ at least one DAV:propstat to appear for
- * every DAV:response. In some circumstances however, there are no
- * properties to encode.
- *
- * In those cases we MUST specify at least one DAV:propstat anyway, with
- * no properties.
- */
- function testSerializeNoProperties() {
-
- $innerProps = [];
-
- $property = new Response('uri', $innerProps);
- $xml = $this->write(['{DAV:}root' => ['{DAV:}response' => $property]]);
-
- $this->assertXmlStringEqualsXmlString(
-'<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:response>
- <d:href>/uri</d:href>
- <d:propstat>
- <d:prop />
- <d:status>HTTP/1.1 418 I\'m a teapot</d:status>
- </d:propstat>
- </d:response>
-</d:root>
-', $xml);
-
- }
-
- /**
- * In the case of {DAV:}prop, a deserializer should never get called, if
- * the property element is empty.
- */
- function testDeserializeComplexPropertyEmpty() {
-
- $xml = '<?xml version="1.0"?>
-<d:response xmlns:d="DAV:">
- <d:href>/uri</d:href>
- <d:propstat>
- <d:prop>
- <d:foo />
- </d:prop>
- <d:status>HTTP/1.1 404 Not Found</d:status>
- </d:propstat>
-</d:response>
-';
-
- $result = $this->parse($xml, [
- '{DAV:}response' => 'Sabre\DAV\Xml\Element\Response',
- '{DAV:}foo' => function($reader) {
- throw new \LogicException('This should never happen');
- },
- ]);
- $this->assertEquals(
- new Response('/uri', [
- '404' => [
- '{DAV:}foo' => null
- ]
- ]),
- $result['value']
- );
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Element/ShareeTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Element/ShareeTest.php
deleted file mode 100644
index 3704d878244..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Element/ShareeTest.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Xml\Element;
-
-use Sabre\DAV\Sharing\Plugin;
-use Sabre\DAV\Xml\XmlTest;
-
-class ShareeTest extends XmlTest {
-
- /**
- * @expectedException \InvalidArgumentException
- */
- function testShareeUnknownPropertyInConstructor() {
-
- new Sharee(['foo' => 'bar']);
-
- }
-
- function testDeserialize() {
-
- $xml = <<<XML
-<?xml version="1.0" encoding="utf-8" ?>
-<D:sharee xmlns:D="DAV:">
- <D:href>mailto:eric@example.com</D:href>
- <D:prop>
- <D:displayname>Eric York</D:displayname>
- </D:prop>
- <D:comment>Shared workspace</D:comment>
- <D:share-access>
- <D:read-write />
- </D:share-access>
-</D:sharee>
-XML;
-
- $result = $this->parse($xml, [
- '{DAV:}sharee' => 'Sabre\\DAV\\Xml\\Element\\Sharee'
- ]);
-
- $expected = new Sharee([
- 'href' => 'mailto:eric@example.com',
- 'properties' => ['{DAV:}displayname' => 'Eric York'],
- 'comment' => 'Shared workspace',
- 'access' => Plugin::ACCESS_READWRITE,
- ]);
- $this->assertEquals(
- $expected,
- $result['value']
- );
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\BadRequest
- */
- function testDeserializeNoHref() {
-
- $xml = <<<XML
-<?xml version="1.0" encoding="utf-8" ?>
-<D:sharee xmlns:D="DAV:">
- <D:prop>
- <D:displayname>Eric York</D:displayname>
- </D:prop>
- <D:comment>Shared workspace</D:comment>
- <D:share-access>
- <D:read-write />
- </D:share-access>
-</D:sharee>
-XML;
-
- $this->parse($xml, [
- '{DAV:}sharee' => 'Sabre\\DAV\\Xml\\Element\\Sharee'
- ]);
-
- }
-
-
- /**
- * @expectedException \Sabre\DAV\Exception\BadRequest
- */
- function testDeserializeNoShareeAccess() {
-
- $xml = <<<XML
-<?xml version="1.0" encoding="utf-8" ?>
-<D:sharee xmlns:D="DAV:">
- <D:href>mailto:eric@example.com</D:href>
- <D:prop>
- <D:displayname>Eric York</D:displayname>
- </D:prop>
- <D:comment>Shared workspace</D:comment>
-</D:sharee>
-XML;
-
- $this->parse($xml, [
- '{DAV:}sharee' => 'Sabre\\DAV\\Xml\\Element\\Sharee'
- ]);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/HrefTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/HrefTest.php
deleted file mode 100644
index bf58853371e..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/HrefTest.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Xml\Property;
-
-use Sabre\DAV;
-use Sabre\DAV\Browser\HtmlOutputHelper;
-use Sabre\DAV\Xml\XmlTest;
-
-class HrefTest extends XmlTest {
-
- function testConstruct() {
-
- $href = new Href('path');
- $this->assertEquals('path', $href->getHref());
-
- }
-
- function testSerialize() {
-
- $href = new Href('path');
- $this->assertEquals('path', $href->getHref());
-
- $this->contextUri = '/bla/';
-
- $xml = $this->write(['{DAV:}anything' => $href]);
-
- $this->assertXmlStringEqualsXmlString(
-'<?xml version="1.0"?>
-<d:anything xmlns:d="DAV:"><d:href>/bla/path</d:href></d:anything>
-', $xml);
-
- }
-
- function testUnserialize() {
-
- $xml = '<?xml version="1.0"?>
-<d:anything xmlns:d="DAV:"><d:href>/bla/path</d:href></d:anything>
-';
-
- $result = $this->parse($xml, ['{DAV:}anything' => 'Sabre\\DAV\\Xml\\Property\\Href']);
-
- $href = $result['value'];
-
- $this->assertInstanceOf('Sabre\\DAV\\Xml\\Property\\Href', $href);
-
- $this->assertEquals('/bla/path', $href->getHref());
-
- }
-
- function testUnserializeIncompatible() {
-
- $xml = '<?xml version="1.0"?>
-<d:anything xmlns:d="DAV:"><d:href2>/bla/path</d:href2></d:anything>
-';
- $result = $this->parse($xml, ['{DAV:}anything' => 'Sabre\\DAV\\Xml\\Property\\Href']);
- $href = $result['value'];
- $this->assertNull($href);
-
- }
- function testUnserializeEmpty() {
-
- $xml = '<?xml version="1.0"?>
-<d:anything xmlns:d="DAV:"></d:anything>
-';
- $result = $this->parse($xml, ['{DAV:}anything' => 'Sabre\\DAV\\Xml\\Property\\Href']);
- $href = $result['value'];
- $this->assertNull($href);
-
- }
-
- /**
- * This method tests if hrefs containing & are correctly encoded.
- */
- function testSerializeEntity() {
-
- $href = new Href('http://example.org/?a&b', false);
- $this->assertEquals('http://example.org/?a&b', $href->getHref());
-
- $xml = $this->write(['{DAV:}anything' => $href]);
-
- $this->assertXmlStringEqualsXmlString(
-'<?xml version="1.0"?>
-<d:anything xmlns:d="DAV:"><d:href>http://example.org/?a&b</d:href></d:anything>
-', $xml);
-
- }
-
- function testToHtml() {
-
- $href = new Href([
- '/foo/bar',
- 'foo/bar',
- 'http://example.org/bar'
- ]);
-
- $html = new HtmlOutputHelper(
- '/base/',
- []
- );
-
- $expected =
- '<a href="/foo/bar">/foo/bar</a><br />' .
- '<a href="/base/foo/bar">/base/foo/bar</a><br />' .
- '<a href="http://example.org/bar">http://example.org/bar</a>';
- $this->assertEquals($expected, $href->toHtml($html));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/InviteTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/InviteTest.php
deleted file mode 100644
index 6f8d6cc6c30..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/InviteTest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Xml\Property;
-
-use Sabre\DAV\Sharing\Plugin;
-use Sabre\DAV\Xml\Element\Sharee;
-use Sabre\DAV\Xml\XmlTest;
-
-class InviteTest extends XmlTest {
-
- function testSerialize() {
-
- $sharees = [
- new Sharee(),
- new Sharee(),
- new Sharee(),
- new Sharee()
- ];
- $sharees[0]->href = 'mailto:foo@example.org';
- $sharees[0]->properties['{DAV:}displayname'] = 'Foo Bar';
- $sharees[0]->access = Plugin::ACCESS_SHAREDOWNER;
- $sharees[0]->inviteStatus = Plugin::INVITE_ACCEPTED;
-
- $sharees[1]->href = 'mailto:bar@example.org';
- $sharees[1]->access = Plugin::ACCESS_READ;
- $sharees[1]->inviteStatus = Plugin::INVITE_DECLINED;
-
- $sharees[2]->href = 'mailto:baz@example.org';
- $sharees[2]->access = Plugin::ACCESS_READWRITE;
- $sharees[2]->inviteStatus = Plugin::INVITE_NORESPONSE;
-
- $sharees[3]->href = 'mailto:zim@example.org';
- $sharees[3]->access = Plugin::ACCESS_READWRITE;
- $sharees[3]->inviteStatus = Plugin::INVITE_INVALID;
-
- $invite = new Invite($sharees);
-
- $xml = $this->write(['{DAV:}root' => $invite]);
-
- $expected = <<<XML
-<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
-<d:sharee>
- <d:href>mailto:foo@example.org</d:href>
- <d:prop>
- <d:displayname>Foo Bar</d:displayname>
- </d:prop>
- <d:share-access><d:shared-owner /></d:share-access>
- <d:invite-accepted/>
-</d:sharee>
-<d:sharee>
- <d:href>mailto:bar@example.org</d:href>
- <d:prop />
- <d:share-access><d:read /></d:share-access>
- <d:invite-declined/>
-</d:sharee>
-<d:sharee>
- <d:href>mailto:baz@example.org</d:href>
- <d:prop />
- <d:share-access><d:read-write /></d:share-access>
- <d:invite-noresponse/>
-</d:sharee>
-<d:sharee>
- <d:href>mailto:zim@example.org</d:href>
- <d:prop />
- <d:share-access><d:read-write /></d:share-access>
- <d:invite-invalid/>
-</d:sharee>
-</d:root>
-XML;
-
- $this->assertXmlStringEqualsXmlString($expected, $xml);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/LastModifiedTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/LastModifiedTest.php
deleted file mode 100644
index 669efbd4534..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/LastModifiedTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Xml\Property;
-
-use DateTime;
-use DateTimeZone;
-use Sabre\DAV\Xml\XmlTest;
-
-class LastModifiedTest extends XmlTest {
-
- function testSerializeDateTime() {
-
- $dt = new DateTime('2015-03-24 11:47:00', new DateTimeZone('America/Vancouver'));
- $val = ['{DAV:}getlastmodified' => new GetLastModified($dt)];
-
- $result = $this->write($val);
- $expected = <<<XML
-<?xml version="1.0"?>
-<d:getlastmodified xmlns:d="DAV:">Tue, 24 Mar 2015 18:47:00 GMT</d:getlastmodified>
-XML;
-
- $this->assertXmlStringEqualsXmlString($expected, $result);
-
- }
-
- function testSerializeTimeStamp() {
-
- $dt = new DateTime('2015-03-24 11:47:00', new DateTimeZone('America/Vancouver'));
- $dt = $dt->getTimeStamp();
- $val = ['{DAV:}getlastmodified' => new GetLastModified($dt)];
-
- $result = $this->write($val);
- $expected = <<<XML
-<?xml version="1.0"?>
-<d:getlastmodified xmlns:d="DAV:">Tue, 24 Mar 2015 18:47:00 GMT</d:getlastmodified>
-XML;
-
- $this->assertXmlStringEqualsXmlString($expected, $result);
-
- }
-
- function testDeserialize() {
-
- $input = <<<XML
-<?xml version="1.0"?>
-<d:getlastmodified xmlns:d="DAV:">Tue, 24 Mar 2015 18:47:00 GMT</d:getlastmodified>
-XML;
-
- $elementMap = ['{DAV:}getlastmodified' => 'Sabre\DAV\Xml\Property\GetLastModified'];
- $result = $this->parse($input, $elementMap);
-
- $this->assertEquals(
- new DateTime('2015-03-24 18:47:00', new DateTimeZone('UTC')),
- $result['value']->getTime()
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/LocalHrefTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/LocalHrefTest.php
deleted file mode 100644
index c3f69c929f6..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/LocalHrefTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Xml\Property;
-
-use Sabre\DAV;
-use Sabre\DAV\Browser\HtmlOutputHelper;
-use Sabre\DAV\Xml\XmlTest;
-
-class LocalHrefTest extends XmlTest {
-
- function testConstruct() {
-
- $href = new LocalHref('path');
- $this->assertEquals('path', $href->getHref());
-
- }
-
- function testSerialize() {
-
- $href = new LocalHref('path');
- $this->assertEquals('path', $href->getHref());
-
- $this->contextUri = '/bla/';
-
- $xml = $this->write(['{DAV:}anything' => $href]);
-
- $this->assertXmlStringEqualsXmlString(
-'<?xml version="1.0"?>
-<d:anything xmlns:d="DAV:"><d:href>/bla/path</d:href></d:anything>
-', $xml);
-
- }
- function testSerializeSpace() {
-
- $href = new LocalHref('path alsopath');
- $this->assertEquals('path%20alsopath', $href->getHref());
-
- $this->contextUri = '/bla/';
-
- $xml = $this->write(['{DAV:}anything' => $href]);
-
- $this->assertXmlStringEqualsXmlString(
-'<?xml version="1.0"?>
-<d:anything xmlns:d="DAV:"><d:href>/bla/path%20alsopath</d:href></d:anything>
-', $xml);
-
- }
- function testToHtml() {
-
- $href = new LocalHref([
- '/foo/bar',
- 'foo/bar',
- 'http://example.org/bar'
- ]);
-
- $html = new HtmlOutputHelper(
- '/base/',
- []
- );
-
- $expected =
- '<a href="/foo/bar">/foo/bar</a><br />' .
- '<a href="/base/foo/bar">/base/foo/bar</a><br />' .
- '<a href="http://example.org/bar">http://example.org/bar</a>';
- $this->assertEquals($expected, $href->toHtml($html));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/LockDiscoveryTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/LockDiscoveryTest.php
deleted file mode 100644
index 0ad069c4723..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/LockDiscoveryTest.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Xml\Property;
-
-use Sabre\DAV\Locks\LockInfo;
-use Sabre\DAV\Xml\XmlTest;
-
-class LockDiscoveryTest extends XmlTest {
-
- function testSerialize() {
-
- $lock = new LockInfo();
- $lock->owner = 'hello';
- $lock->token = 'blabla';
- $lock->timeout = 600;
- $lock->created = strtotime('2015-03-25 19:21:00');
- $lock->scope = LockInfo::EXCLUSIVE;
- $lock->depth = 0;
- $lock->uri = 'hi';
-
- $prop = new LockDiscovery([$lock]);
-
- $xml = $this->write(['{DAV:}root' => $prop]);
-
- $this->assertXmlStringEqualsXmlString(
-'<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:activelock>
- <d:lockscope><d:exclusive /></d:lockscope>
- <d:locktype><d:write /></d:locktype>
- <d:lockroot>
- <d:href>/hi</d:href>
- </d:lockroot>
- <d:depth>0</d:depth>
- <d:timeout>Second-600</d:timeout>
- <d:locktoken>
- <d:href>opaquelocktoken:blabla</d:href>
- </d:locktoken>
- <d:owner>hello</d:owner>
-
-
-</d:activelock>
-</d:root>
-', $xml);
-
- }
-
- function testSerializeShared() {
-
- $lock = new LockInfo();
- $lock->owner = 'hello';
- $lock->token = 'blabla';
- $lock->timeout = 600;
- $lock->created = strtotime('2015-03-25 19:21:00');
- $lock->scope = LockInfo::SHARED;
- $lock->depth = 0;
- $lock->uri = 'hi';
-
- $prop = new LockDiscovery([$lock]);
-
- $xml = $this->write(['{DAV:}root' => $prop]);
-
- $this->assertXmlStringEqualsXmlString(
-'<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:activelock>
- <d:lockscope><d:shared /></d:lockscope>
- <d:locktype><d:write /></d:locktype>
- <d:lockroot>
- <d:href>/hi</d:href>
- </d:lockroot>
- <d:depth>0</d:depth>
- <d:timeout>Second-600</d:timeout>
- <d:locktoken>
- <d:href>opaquelocktoken:blabla</d:href>
- </d:locktoken>
- <d:owner>hello</d:owner>
-
-
-</d:activelock>
-</d:root>
-', $xml);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/ShareAccessTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/ShareAccessTest.php
deleted file mode 100644
index 6e733dded21..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/ShareAccessTest.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Xml\Property;
-
-use Sabre\DAV\Sharing\Plugin;
-use Sabre\DAV\Xml\XmlTest;
-
-class ShareAccessTest extends XmlTest {
-
- function testSerialize() {
-
- $data = ['{DAV:}root' => [
- [
- 'name' => '{DAV:}share-access',
- 'value' => new ShareAccess(Plugin::ACCESS_READ),
- ],
- [
- 'name' => '{DAV:}share-access',
- 'value' => new ShareAccess(Plugin::ACCESS_READWRITE),
- ],
- [
- 'name' => '{DAV:}share-access',
- 'value' => new ShareAccess(Plugin::ACCESS_NOTSHARED),
- ],
- [
- 'name' => '{DAV:}share-access',
- 'value' => new ShareAccess(Plugin::ACCESS_NOACCESS),
- ],
- [
- 'name' => '{DAV:}share-access',
- 'value' => new ShareAccess(Plugin::ACCESS_SHAREDOWNER),
- ],
-
- ]];
-
- $xml = $this->write($data);
-
- $expected = <<<XML
-<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:share-access><d:read /></d:share-access>
- <d:share-access><d:read-write /></d:share-access>
- <d:share-access><d:not-shared /></d:share-access>
- <d:share-access><d:no-access /></d:share-access>
- <d:share-access><d:shared-owner /></d:share-access>
-</d:root>
-XML;
-
- $this->assertXmlStringEqualsXmlString($expected, $xml);
-
- }
-
- function testDeserialize() {
-
- $input = <<<XML
-<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:share-access><d:read /></d:share-access>
- <d:share-access><d:read-write /></d:share-access>
- <d:share-access><d:not-shared /></d:share-access>
- <d:share-access><d:no-access /></d:share-access>
- <d:share-access><d:shared-owner /></d:share-access>
-</d:root>
-XML;
-
- $data = [
- [
- 'name' => '{DAV:}share-access',
- 'value' => new ShareAccess(Plugin::ACCESS_READ),
- 'attributes' => [],
- ],
- [
- 'name' => '{DAV:}share-access',
- 'value' => new ShareAccess(Plugin::ACCESS_READWRITE),
- 'attributes' => [],
- ],
- [
- 'name' => '{DAV:}share-access',
- 'value' => new ShareAccess(Plugin::ACCESS_NOTSHARED),
- 'attributes' => [],
- ],
- [
- 'name' => '{DAV:}share-access',
- 'value' => new ShareAccess(Plugin::ACCESS_NOACCESS),
- 'attributes' => [],
- ],
- [
- 'name' => '{DAV:}share-access',
- 'value' => new ShareAccess(Plugin::ACCESS_SHAREDOWNER),
- 'attributes' => [],
- ],
-
- ];
-
- $this->assertParsedValue(
- $data,
- $input,
- ['{DAV:}share-access' => ShareAccess::class]
- );
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\BadRequest
- */
- function testDeserializeInvalid() {
-
- $input = <<<XML
-<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:share-access><d:foo /></d:share-access>
-</d:root>
-XML;
-
- $this->parse(
- $input,
- ['{DAV:}share-access' => ShareAccess::class]
- );
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/SupportedMethodSetTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/SupportedMethodSetTest.php
deleted file mode 100644
index 3d54acd2d9d..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/SupportedMethodSetTest.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Xml\Property;
-
-use Sabre\DAV\Xml\XmlTest;
-
-class SupportedMethodSetTest extends XmlTest {
-
- function testSimple() {
-
- $cus = new SupportedMethodSet(['GET', 'PUT']);
- $this->assertEquals(['GET', 'PUT'], $cus->getValue());
-
- $this->assertTrue($cus->has('GET'));
- $this->assertFalse($cus->has('HEAD'));
-
- }
-
- function testSerialize() {
-
- $cus = new SupportedMethodSet(['GET', 'PUT']);
- $xml = $this->write(['{DAV:}foo' => $cus]);
-
- $expected = '<?xml version="1.0"?>
-<d:foo xmlns:d="DAV:">
- <d:supported-method name="GET"/>
- <d:supported-method name="PUT"/>
-</d:foo>';
-
- $this->assertXmlStringEqualsXmlString($expected, $xml);
-
- }
-
- function testSerializeHtml() {
-
- $cus = new SupportedMethodSet(['GET', 'PUT']);
- $result = $cus->toHtml(
- new \Sabre\DAV\Browser\HtmlOutputHelper('/', [])
- );
-
- $this->assertEquals('GET, PUT', $result);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/SupportedReportSetTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/SupportedReportSetTest.php
deleted file mode 100644
index cc25697f68d..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Property/SupportedReportSetTest.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Property;
-
-use Sabre\DAV;
-use Sabre\HTTP;
-
-require_once 'Sabre/HTTP/ResponseMock.php';
-require_once 'Sabre/DAV/AbstractServer.php';
-
-class SupportedReportSetTest extends DAV\AbstractServer {
-
- function sendPROPFIND($body) {
-
- $serverVars = [
- 'REQUEST_URI' => '/',
- 'REQUEST_METHOD' => 'PROPFIND',
- 'HTTP_DEPTH' => '0',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody($body);
-
- $this->server->httpRequest = ($request);
- $this->server->exec();
-
- }
-
- /**
- */
- function testNoReports() {
-
- $xml = '<?xml version="1.0"?>
-<d:propfind xmlns:d="DAV:">
- <d:prop>
- <d:supported-report-set />
- </d:prop>
-</d:propfind>';
-
- $this->sendPROPFIND($xml);
-
- $this->assertEquals(207, $this->response->status, 'We expected a multi-status response. Full response body: ' . $this->response->body);
-
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", "xmlns\\1=\"urn:DAV\"", $this->response->body);
- $xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d', 'urn:DAV');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop');
- $this->assertEquals(1, count($data), 'We expected 1 \'d:prop\' element');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supported-report-set');
- $this->assertEquals(1, count($data), 'We expected 1 \'d:supported-report-set\' element');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:status');
- $this->assertEquals(1, count($data), 'We expected 1 \'d:status\' element');
-
- $this->assertEquals('HTTP/1.1 200 OK', (string)$data[0], 'The status for this property should have been 200');
-
- }
-
- /**
- * @depends testNoReports
- */
- function testCustomReport() {
-
- // Intercepting the report property
- $this->server->on('propFind', function(DAV\PropFind $propFind, DAV\INode $node) {
- if ($prop = $propFind->get('{DAV:}supported-report-set')) {
- $prop->addReport('{http://www.rooftopsolutions.nl/testnamespace}myreport');
- $prop->addReport('{DAV:}anotherreport');
- }
- }, 200);
-
- $xml = '<?xml version="1.0"?>
-<d:propfind xmlns:d="DAV:">
- <d:prop>
- <d:supported-report-set />
- </d:prop>
-</d:propfind>';
-
- $this->sendPROPFIND($xml);
-
- $this->assertEquals(207, $this->response->status, 'We expected a multi-status response. Full response body: ' . $this->response->body);
-
- $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", "xmlns\\1=\"urn:DAV\"", $this->response->body);
- $xml = simplexml_load_string($body);
- $xml->registerXPathNamespace('d', 'urn:DAV');
- $xml->registerXPathNamespace('x', 'http://www.rooftopsolutions.nl/testnamespace');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop');
- $this->assertEquals(1, count($data), 'We expected 1 \'d:prop\' element');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supported-report-set');
- $this->assertEquals(1, count($data), 'We expected 1 \'d:supported-report-set\' element');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supported-report-set/d:supported-report');
- $this->assertEquals(2, count($data), 'We expected 2 \'d:supported-report\' elements');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supported-report-set/d:supported-report/d:report');
- $this->assertEquals(2, count($data), 'We expected 2 \'d:report\' elements');
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supported-report-set/d:supported-report/d:report/x:myreport');
- $this->assertEquals(1, count($data), 'We expected 1 \'x:myreport\' element. Full body: ' . $this->response->body);
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supported-report-set/d:supported-report/d:report/d:anotherreport');
- $this->assertEquals(1, count($data), 'We expected 1 \'d:anotherreport\' element. Full body: ' . $this->response->body);
-
- $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:status');
- $this->assertEquals(1, count($data), 'We expected 1 \'d:status\' element');
-
- $this->assertEquals('HTTP/1.1 200 OK', (string)$data[0], 'The status for this property should have been 200');
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Request/PropFindTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Request/PropFindTest.php
deleted file mode 100644
index c11668b6188..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Request/PropFindTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Xml\Request;
-
-use Sabre\DAV\Xml\XmlTest;
-
-class PropFindTest extends XmlTest {
-
- function testDeserializeProp() {
-
- $xml = '<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:prop>
- <d:hello />
- </d:prop>
-</d:root>
-';
-
- $result = $this->parse($xml, ['{DAV:}root' => 'Sabre\\DAV\\Xml\\Request\PropFind']);
-
- $propFind = new PropFind();
- $propFind->properties = ['{DAV:}hello'];
-
- $this->assertEquals($propFind, $result['value']);
-
-
- }
-
- function testDeserializeAllProp() {
-
- $xml = '<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:allprop />
-</d:root>
-';
-
- $result = $this->parse($xml, ['{DAV:}root' => 'Sabre\\DAV\\Xml\\Request\PropFind']);
-
- $propFind = new PropFind();
- $propFind->allProp = true;
-
- $this->assertEquals($propFind, $result['value']);
-
-
- }
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Request/PropPatchTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Request/PropPatchTest.php
deleted file mode 100644
index 03514da5cb6..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Request/PropPatchTest.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Xml\Request;
-
-use Sabre\DAV\Xml\Property\Href;
-use Sabre\DAV\Xml\XmlTest;
-
-class PropPatchTest extends XmlTest {
-
- function testSerialize() {
-
- $propPatch = new PropPatch();
- $propPatch->properties = [
- '{DAV:}displayname' => 'Hello!',
- '{DAV:}delete-me' => null,
- '{DAV:}some-url' => new Href('foo/bar')
- ];
-
- $result = $this->write(
- ['{DAV:}propertyupdate' => $propPatch]
- );
-
- $expected = <<<XML
-<?xml version="1.0"?>
-<d:propertyupdate xmlns:d="DAV:">
- <d:set>
- <d:prop>
- <d:displayname>Hello!</d:displayname>
- </d:prop>
- </d:set>
- <d:remove>
- <d:prop>
- <d:delete-me />
- </d:prop>
- </d:remove>
- <d:set>
- <d:prop>
- <d:some-url>
- <d:href>/foo/bar</d:href>
- </d:some-url>
- </d:prop>
- </d:set>
-</d:propertyupdate>
-XML;
-
- $this->assertXmlStringEqualsXmlString(
- $expected,
- $result
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Request/ShareResourceTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Request/ShareResourceTest.php
deleted file mode 100644
index 1e6b5602de0..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Request/ShareResourceTest.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Xml\Request;
-
-use Sabre\DAV\Sharing\Plugin;
-use Sabre\DAV\Xml\Element\Sharee;
-use Sabre\DAV\Xml\XmlTest;
-
-class ShareResourceTest extends XmlTest {
-
- function testDeserialize() {
-
- $xml = <<<XML
-<?xml version="1.0" encoding="utf-8" ?>
-<D:share-resource xmlns:D="DAV:">
- <D:sharee>
- <D:href>mailto:eric@example.com</D:href>
- <D:prop>
- <D:displayname>Eric York</D:displayname>
- </D:prop>
- <D:comment>Shared workspace</D:comment>
- <D:share-access>
- <D:read-write />
- </D:share-access>
- </D:sharee>
- <D:sharee>
- <D:href>mailto:eric@example.com</D:href>
- <D:share-access>
- <D:read />
- </D:share-access>
- </D:sharee>
- <D:sharee>
- <D:href>mailto:wilfredo@example.com</D:href>
- <D:share-access>
- <D:no-access />
- </D:share-access>
- </D:sharee>
-</D:share-resource>
-XML;
-
- $result = $this->parse($xml, [
- '{DAV:}share-resource' => 'Sabre\\DAV\\Xml\\Request\\ShareResource'
- ]);
-
- $this->assertInstanceOf(
- 'Sabre\\DAV\\Xml\\Request\\ShareResource',
- $result['value']
- );
-
- $expected = [
- new Sharee(),
- new Sharee(),
- new Sharee(),
- ];
-
- $expected[0]->href = 'mailto:eric@example.com';
- $expected[0]->properties['{DAV:}displayname'] = 'Eric York';
- $expected[0]->comment = 'Shared workspace';
- $expected[0]->access = Plugin::ACCESS_READWRITE;
-
- $expected[1]->href = 'mailto:eric@example.com';
- $expected[1]->access = Plugin::ACCESS_READ;
-
- $expected[2]->href = 'mailto:wilfredo@example.com';
- $expected[2]->access = Plugin::ACCESS_NOACCESS;
-
- $this->assertEquals(
- $expected,
- $result['value']->sharees
- );
-
- }
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Request/SyncCollectionTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Request/SyncCollectionTest.php
deleted file mode 100644
index bde1a103d19..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/Request/SyncCollectionTest.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Xml\Request;
-
-use Sabre\DAV\Xml\XmlTest;
-
-class SyncCollectionTest extends XmlTest {
-
- function testDeserializeProp() {
-
- $xml = '<?xml version="1.0"?>
-<d:sync-collection xmlns:d="DAV:">
- <d:sync-token />
- <d:sync-level>1</d:sync-level>
- <d:prop>
- <d:foo />
- </d:prop>
-</d:sync-collection>
-';
-
- $result = $this->parse($xml, ['{DAV:}sync-collection' => 'Sabre\\DAV\\Xml\\Request\\SyncCollectionReport']);
-
- $elem = new SyncCollectionReport();
- $elem->syncLevel = 1;
- $elem->properties = ['{DAV:}foo'];
-
- $this->assertEquals($elem, $result['value']);
-
- }
-
-
- function testDeserializeLimit() {
-
- $xml = '<?xml version="1.0"?>
-<d:sync-collection xmlns:d="DAV:">
- <d:sync-token />
- <d:sync-level>1</d:sync-level>
- <d:prop>
- <d:foo />
- </d:prop>
- <d:limit><d:nresults>5</d:nresults></d:limit>
-</d:sync-collection>
-';
-
- $result = $this->parse($xml, ['{DAV:}sync-collection' => 'Sabre\\DAV\\Xml\\Request\\SyncCollectionReport']);
-
- $elem = new SyncCollectionReport();
- $elem->syncLevel = 1;
- $elem->properties = ['{DAV:}foo'];
- $elem->limit = 5;
-
- $this->assertEquals($elem, $result['value']);
-
- }
-
-
- function testDeserializeInfinity() {
-
- $xml = '<?xml version="1.0"?>
-<d:sync-collection xmlns:d="DAV:">
- <d:sync-token />
- <d:sync-level>infinity</d:sync-level>
- <d:prop>
- <d:foo />
- </d:prop>
-</d:sync-collection>
-';
-
- $result = $this->parse($xml, ['{DAV:}sync-collection' => 'Sabre\\DAV\\Xml\\Request\\SyncCollectionReport']);
-
- $elem = new SyncCollectionReport();
- $elem->syncLevel = \Sabre\DAV\Server::DEPTH_INFINITY;
- $elem->properties = ['{DAV:}foo'];
-
- $this->assertEquals($elem, $result['value']);
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\BadRequest
- */
- function testDeserializeMissingElem() {
-
- $xml = '<?xml version="1.0"?>
-<d:sync-collection xmlns:d="DAV:">
- <d:sync-token />
-</d:sync-collection>
-';
-
- $result = $this->parse($xml, ['{DAV:}sync-collection' => 'Sabre\\DAV\\Xml\\Request\\SyncCollectionReport']);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/XmlTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/XmlTest.php
deleted file mode 100644
index 906a36085bc..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAV/Xml/XmlTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Sabre\DAV\Xml;
-
-use Sabre\Xml\Reader;
-use Sabre\Xml\Writer;
-
-abstract class XmlTest extends \PHPUnit_Framework_TestCase {
-
- protected $elementMap = [];
- protected $namespaceMap = ['DAV:' => 'd'];
- protected $contextUri = '/';
-
- function write($input) {
-
- $writer = new Writer();
- $writer->contextUri = $this->contextUri;
- $writer->namespaceMap = $this->namespaceMap;
- $writer->openMemory();
- $writer->setIndent(true);
- $writer->write($input);
- return $writer->outputMemory();
-
- }
-
- function parse($xml, array $elementMap = []) {
-
- $reader = new Reader();
- $reader->elementMap = array_merge($this->elementMap, $elementMap);
- $reader->xml($xml);
- return $reader->parse();
-
- }
-
- function assertParsedValue($expected, $xml, array $elementMap = []) {
-
- $result = $this->parse($xml, $elementMap);
- $this->assertEquals($expected, $result['value']);
-
- }
-
- function cleanUp() {
-
- libxml_clear_errors();
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php
deleted file mode 100644
index 7d7a54d064c..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/ACLMethodTest.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-use Sabre\DAV;
-use Sabre\HTTP;
-
-class ACLMethodTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * @expectedException Sabre\DAV\Exception\BadRequest
- */
- function testCallback() {
-
- $acl = new Plugin();
- $server = new DAV\Server();
- $server->addPlugin(new DAV\Auth\Plugin());
- $server->addPlugin($acl);
-
- $acl->httpAcl($server->httpRequest, $server->httpResponse);
-
- }
-
- /**
- /**
- * @expectedException Sabre\DAV\Exception\MethodNotAllowed
- */
- function testNotSupportedByNode() {
-
- $tree = [
- new DAV\SimpleCollection('test'),
- ];
- $acl = new Plugin();
- $server = new DAV\Server($tree);
- $server->httpRequest = new HTTP\Request();
- $body = '<?xml version="1.0"?>
-<d:acl xmlns:d="DAV:">
-</d:acl>';
- $server->httpRequest->setBody($body);
- $server->addPlugin(new DAV\Auth\Plugin());
- $server->addPlugin($acl);
-
- $acl->httpACL($server->httpRequest, $server->httpResponse);
-
- }
-
- function testSuccessSimple() {
-
- $tree = [
- new MockACLNode('test', []),
- ];
- $acl = new Plugin();
- $server = new DAV\Server($tree);
- $server->httpRequest = new HTTP\Request();
- $server->httpRequest->setUrl('/test');
-
- $body = '<?xml version="1.0"?>
-<d:acl xmlns:d="DAV:">
-</d:acl>';
- $server->httpRequest->setBody($body);
- $server->addPlugin(new DAV\Auth\Plugin());
- $server->addPlugin($acl);
-
- $this->assertFalse($acl->httpACL($server->httpRequest, $server->httpResponse));
-
- }
-
- /**
- * @expectedException Sabre\DAVACL\Exception\NotRecognizedPrincipal
- */
- function testUnrecognizedPrincipal() {
-
- $tree = [
- new MockACLNode('test', []),
- ];
- $acl = new Plugin();
- $server = new DAV\Server($tree);
- $server->httpRequest = new HTTP\Request('ACL', '/test');
- $body = '<?xml version="1.0"?>
-<d:acl xmlns:d="DAV:">
- <d:ace>
- <d:grant><d:privilege><d:read /></d:privilege></d:grant>
- <d:principal><d:href>/principals/notfound</d:href></d:principal>
- </d:ace>
-</d:acl>';
- $server->httpRequest->setBody($body);
- $server->addPlugin(new DAV\Auth\Plugin());
- $server->addPlugin($acl);
-
- $acl->httpACL($server->httpRequest, $server->httpResponse);
-
- }
-
- /**
- * @expectedException Sabre\DAVACL\Exception\NotRecognizedPrincipal
- */
- function testUnrecognizedPrincipal2() {
-
- $tree = [
- new MockACLNode('test', []),
- new DAV\SimpleCollection('principals', [
- new DAV\SimpleCollection('notaprincipal'),
- ]),
- ];
- $acl = new Plugin();
- $server = new DAV\Server($tree);
- $server->httpRequest = new HTTP\Request('ACL', '/test');
- $body = '<?xml version="1.0"?>
-<d:acl xmlns:d="DAV:">
- <d:ace>
- <d:grant><d:privilege><d:read /></d:privilege></d:grant>
- <d:principal><d:href>/principals/notaprincipal</d:href></d:principal>
- </d:ace>
-</d:acl>';
- $server->httpRequest->setBody($body);
- $server->addPlugin(new DAV\Auth\Plugin());
- $server->addPlugin($acl);
-
- $acl->httpACL($server->httpRequest, $server->httpResponse);
-
- }
-
- /**
- * @expectedException Sabre\DAVACL\Exception\NotSupportedPrivilege
- */
- function testUnknownPrivilege() {
-
- $tree = [
- new MockACLNode('test', []),
- ];
- $acl = new Plugin();
- $server = new DAV\Server($tree);
- $server->httpRequest = new HTTP\Request('ACL', '/test');
- $body = '<?xml version="1.0"?>
-<d:acl xmlns:d="DAV:">
- <d:ace>
- <d:grant><d:privilege><d:bananas /></d:privilege></d:grant>
- <d:principal><d:href>/principals/notfound</d:href></d:principal>
- </d:ace>
-</d:acl>';
- $server->httpRequest->setBody($body);
- $server->addPlugin(new DAV\Auth\Plugin());
- $server->addPlugin($acl);
-
- $acl->httpACL($server->httpRequest, $server->httpResponse);
-
- }
-
- /**
- * @expectedException Sabre\DAVACL\Exception\NoAbstract
- */
- function testAbstractPrivilege() {
-
- $tree = [
- new MockACLNode('test', []),
- ];
- $acl = new Plugin();
- $server = new DAV\Server($tree);
- $server->on('getSupportedPrivilegeSet', function($node, &$supportedPrivilegeSet) {
- $supportedPrivilegeSet['{DAV:}foo'] = ['abstract' => true];
- });
- $server->httpRequest = new HTTP\Request('ACL', '/test');
- $body = '<?xml version="1.0"?>
-<d:acl xmlns:d="DAV:">
- <d:ace>
- <d:grant><d:privilege><d:foo /></d:privilege></d:grant>
- <d:principal><d:href>/principals/foo/</d:href></d:principal>
- </d:ace>
-</d:acl>';
- $server->httpRequest->setBody($body);
- $server->addPlugin(new DAV\Auth\Plugin());
- $server->addPlugin($acl);
-
- $acl->httpACL($server->httpRequest, $server->httpResponse);
-
- }
-
- /**
- * @expectedException Sabre\DAVACL\Exception\AceConflict
- */
- function testUpdateProtectedPrivilege() {
-
- $oldACL = [
- [
- 'principal' => 'principals/notfound',
- 'privilege' => '{DAV:}write',
- 'protected' => true,
- ],
- ];
-
- $tree = [
- new MockACLNode('test', $oldACL),
- ];
- $acl = new Plugin();
- $server = new DAV\Server($tree);
- $server->httpRequest = new HTTP\Request('ACL', '/test');
- $body = '<?xml version="1.0"?>
-<d:acl xmlns:d="DAV:">
- <d:ace>
- <d:grant><d:privilege><d:read /></d:privilege></d:grant>
- <d:principal><d:href>/principals/notfound</d:href></d:principal>
- </d:ace>
-</d:acl>';
- $server->httpRequest->setBody($body);
- $server->addPlugin(new DAV\Auth\Plugin());
- $server->addPlugin($acl);
-
- $acl->httpACL($server->httpRequest, $server->httpResponse);
-
- }
-
- /**
- * @expectedException Sabre\DAVACL\Exception\AceConflict
- */
- function testUpdateProtectedPrivilege2() {
-
- $oldACL = [
- [
- 'principal' => 'principals/notfound',
- 'privilege' => '{DAV:}write',
- 'protected' => true,
- ],
- ];
-
- $tree = [
- new MockACLNode('test', $oldACL),
- ];
- $acl = new Plugin();
- $server = new DAV\Server($tree);
- $server->httpRequest = new HTTP\Request('ACL', '/test');
- $body = '<?xml version="1.0"?>
-<d:acl xmlns:d="DAV:">
- <d:ace>
- <d:grant><d:privilege><d:write /></d:privilege></d:grant>
- <d:principal><d:href>/principals/foo</d:href></d:principal>
- </d:ace>
-</d:acl>';
- $server->httpRequest->setBody($body);
- $server->addPlugin(new DAV\Auth\Plugin());
- $server->addPlugin($acl);
-
- $acl->httpACL($server->httpRequest, $server->httpResponse);
-
- }
-
- /**
- * @expectedException Sabre\DAVACL\Exception\AceConflict
- */
- function testUpdateProtectedPrivilege3() {
-
- $oldACL = [
- [
- 'principal' => 'principals/notfound',
- 'privilege' => '{DAV:}write',
- 'protected' => true,
- ],
- ];
-
- $tree = [
- new MockACLNode('test', $oldACL),
- ];
- $acl = new Plugin();
- $server = new DAV\Server($tree);
- $server->httpRequest = new HTTP\Request('ACL', '/test');
- $body = '<?xml version="1.0"?>
-<d:acl xmlns:d="DAV:">
- <d:ace>
- <d:grant><d:privilege><d:write /></d:privilege></d:grant>
- <d:principal><d:href>/principals/notfound</d:href></d:principal>
- </d:ace>
-</d:acl>';
- $server->httpRequest->setBody($body);
- $server->addPlugin(new DAV\Auth\Plugin());
- $server->addPlugin($acl);
-
- $acl->httpACL($server->httpRequest, $server->httpResponse);
-
- }
-
- function testSuccessComplex() {
-
- $oldACL = [
- [
- 'principal' => 'principals/foo',
- 'privilege' => '{DAV:}write',
- 'protected' => true,
- ],
- [
- 'principal' => 'principals/bar',
- 'privilege' => '{DAV:}read',
- ],
- ];
-
- $tree = [
- $node = new MockACLNode('test', $oldACL),
- new DAV\SimpleCollection('principals', [
- new MockPrincipal('foo', 'principals/foo'),
- new MockPrincipal('baz', 'principals/baz'),
- ]),
- ];
- $acl = new Plugin();
- $server = new DAV\Server($tree);
- $server->httpRequest = new HTTP\Request('ACL', '/test');
- $body = '<?xml version="1.0"?>
-<d:acl xmlns:d="DAV:">
- <d:ace>
- <d:grant><d:privilege><d:write /></d:privilege></d:grant>
- <d:principal><d:href>/principals/foo</d:href></d:principal>
- <d:protected />
- </d:ace>
- <d:ace>
- <d:grant><d:privilege><d:write /></d:privilege></d:grant>
- <d:principal><d:href>/principals/baz</d:href></d:principal>
- </d:ace>
-</d:acl>';
- $server->httpRequest->setBody($body);
- $server->addPlugin(new DAV\Auth\Plugin());
- $server->addPlugin($acl);
-
-
- $this->assertFalse($acl->httpAcl($server->httpRequest, $server->httpResponse));
-
- $this->assertEquals([
- [
- 'principal' => 'principals/foo',
- 'privilege' => '{DAV:}write',
- 'protected' => true,
- ],
- [
- 'principal' => 'principals/baz',
- 'privilege' => '{DAV:}write',
- 'protected' => false,
- ],
- ], $node->getACL());
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/AclPrincipalPropSetReportTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/AclPrincipalPropSetReportTest.php
deleted file mode 100644
index 338fe36ab0c..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/AclPrincipalPropSetReportTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-use Sabre\HTTP\Request;
-
-class AclPrincipalPropSetReportTest extends \Sabre\DAVServerTest {
-
- public $setupACL = true;
- public $autoLogin = 'admin';
-
- function testReport() {
-
- $xml = <<<XML
-<?xml version="1.0"?>
-<acl-principal-prop-set xmlns="DAV:">
- <prop>
- <principal-URL />
- <displayname />
- </prop>
-</acl-principal-prop-set>
-XML;
-
- $request = new Request('REPORT', '/principals/user1', ['Content-Type' => 'application/xml', 'Depth' => 0]);
- $request->setBody($xml);
-
- $response = $this->request($request, 207);
-
- $expected = <<<XML
-<?xml version="1.0"?>
-<d:multistatus xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
- <d:response>
- <d:href>/principals/admin/</d:href>
- <d:propstat>
- <d:prop>
- <d:principal-URL><d:href>/principals/admin/</d:href></d:principal-URL>
- <d:displayname>Admin</d:displayname>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
- </d:response>
-</d:multistatus>
-XML;
-
- $this->assertXmlStringEqualsXmlString(
- $expected,
- $response->getBodyAsString()
- );
-
- }
-
- function testReportDepth1() {
-
- $xml = <<<XML
-<?xml version="1.0"?>
-<acl-principal-prop-set xmlns="DAV:">
- <principal-URL />
- <displayname />
-</acl-principal-prop-set>
-XML;
-
- $request = new Request('REPORT', '/principals/user1', ['Content-Type' => 'application/xml', 'Depth' => 1]);
- $request->setBody($xml);
-
- $this->request($request, 400);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/AllowAccessTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/AllowAccessTest.php
deleted file mode 100644
index f16693625b2..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/AllowAccessTest.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-use Sabre\DAV;
-
-class AllowAccessTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * @var DAV\Server
- */
- protected $server;
-
- function setUp() {
-
- $nodes = [
- new DAV\Mock\Collection('testdir', [
- 'file1.txt' => 'contents',
- ]),
- ];
-
- $this->server = new DAV\Server($nodes);
- $this->server->addPlugin(
- new DAV\Auth\Plugin(
- new DAV\Auth\Backend\Mock()
- )
- );
- // Login
- $this->server->getPlugin('auth')->beforeMethod(
- new \Sabre\HTTP\Request(),
- new \Sabre\HTTP\Response()
- );
- $aclPlugin = new Plugin();
- $this->server->addPlugin($aclPlugin);
-
- }
-
- function testGet() {
-
- $this->server->httpRequest->setMethod('GET');
- $this->server->httpRequest->setUrl('/testdir');
-
- $this->assertTrue($this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]));
-
- }
-
- function testGetDoesntExist() {
-
- $this->server->httpRequest->setMethod('GET');
- $this->server->httpRequest->setUrl('/foo');
-
- $this->assertTrue($this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]));
-
- }
-
- function testHEAD() {
-
- $this->server->httpRequest->setMethod('HEAD');
- $this->server->httpRequest->setUrl('/testdir');
-
- $this->assertTrue($this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]));
-
- }
-
- function testOPTIONS() {
-
- $this->server->httpRequest->setMethod('OPTIONS');
- $this->server->httpRequest->setUrl('/testdir');
-
- $this->assertTrue($this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]));
-
- }
-
- function testPUT() {
-
- $this->server->httpRequest->setMethod('PUT');
- $this->server->httpRequest->setUrl('/testdir/file1.txt');
-
- $this->assertTrue($this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]));
-
- }
-
- function testPROPPATCH() {
-
- $this->server->httpRequest->setMethod('PROPPATCH');
- $this->server->httpRequest->setUrl('/testdir');
-
- $this->assertTrue($this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]));
-
- }
-
- function testCOPY() {
-
- $this->server->httpRequest->setMethod('COPY');
- $this->server->httpRequest->setUrl('/testdir');
-
- $this->assertTrue($this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]));
-
- }
-
- function testMOVE() {
-
- $this->server->httpRequest->setMethod('MOVE');
- $this->server->httpRequest->setUrl('/testdir');
-
- $this->assertTrue($this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]));
-
- }
-
- function testLOCK() {
-
- $this->server->httpRequest->setMethod('LOCK');
- $this->server->httpRequest->setUrl('/testdir');
-
- $this->assertTrue($this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]));
-
- }
-
- function testBeforeBind() {
-
- $this->assertTrue($this->server->emit('beforeBind', ['testdir/file']));
-
- }
-
-
- function testBeforeUnbind() {
-
- $this->assertTrue($this->server->emit('beforeUnbind', ['testdir']));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/BlockAccessTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/BlockAccessTest.php
deleted file mode 100644
index ceae9aed059..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/BlockAccessTest.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-use Sabre\DAV;
-
-class BlockAccessTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * @var DAV\Server
- */
- protected $server;
- protected $plugin;
-
- function setUp() {
-
- $nodes = [
- new DAV\SimpleCollection('testdir'),
- ];
-
- $this->server = new DAV\Server($nodes);
- $this->plugin = new Plugin();
- $this->plugin->setDefaultAcl([]);
- $this->server->addPlugin(
- new DAV\Auth\Plugin(
- new DAV\Auth\Backend\Mock()
- )
- );
- // Login
- $this->server->getPlugin('auth')->beforeMethod(
- new \Sabre\HTTP\Request(),
- new \Sabre\HTTP\Response()
- );
- $this->server->addPlugin($this->plugin);
-
- }
-
- /**
- * @expectedException Sabre\DAVACL\Exception\NeedPrivileges
- */
- function testGet() {
-
- $this->server->httpRequest->setMethod('GET');
- $this->server->httpRequest->setUrl('/testdir');
-
- $this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]);
-
- }
-
- function testGetDoesntExist() {
-
- $this->server->httpRequest->setMethod('GET');
- $this->server->httpRequest->setUrl('/foo');
-
- $r = $this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]);
- $this->assertTrue($r);
-
- }
-
- /**
- * @expectedException Sabre\DAVACL\Exception\NeedPrivileges
- */
- function testHEAD() {
-
- $this->server->httpRequest->setMethod('HEAD');
- $this->server->httpRequest->setUrl('/testdir');
-
- $this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]);
-
- }
-
- /**
- * @expectedException Sabre\DAVACL\Exception\NeedPrivileges
- */
- function testOPTIONS() {
-
- $this->server->httpRequest->setMethod('OPTIONS');
- $this->server->httpRequest->setUrl('/testdir');
-
- $this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]);
-
- }
-
- /**
- * @expectedException Sabre\DAVACL\Exception\NeedPrivileges
- */
- function testPUT() {
-
- $this->server->httpRequest->setMethod('PUT');
- $this->server->httpRequest->setUrl('/testdir');
-
- $this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]);
-
- }
-
- /**
- * @expectedException Sabre\DAVACL\Exception\NeedPrivileges
- */
- function testPROPPATCH() {
-
- $this->server->httpRequest->setMethod('PROPPATCH');
- $this->server->httpRequest->setUrl('/testdir');
-
- $this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]);
-
- }
-
- /**
- * @expectedException Sabre\DAVACL\Exception\NeedPrivileges
- */
- function testCOPY() {
-
- $this->server->httpRequest->setMethod('COPY');
- $this->server->httpRequest->setUrl('/testdir');
-
- $this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]);
-
- }
-
- /**
- * @expectedException Sabre\DAVACL\Exception\NeedPrivileges
- */
- function testMOVE() {
-
- $this->server->httpRequest->setMethod('MOVE');
- $this->server->httpRequest->setUrl('/testdir');
-
- $this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]);
-
- }
-
- /**
- * @expectedException Sabre\DAVACL\Exception\NeedPrivileges
- */
- function testACL() {
-
- $this->server->httpRequest->setMethod('ACL');
- $this->server->httpRequest->setUrl('/testdir');
-
- $this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]);
-
- }
-
- /**
- * @expectedException Sabre\DAVACL\Exception\NeedPrivileges
- */
- function testLOCK() {
-
- $this->server->httpRequest->setMethod('LOCK');
- $this->server->httpRequest->setUrl('/testdir');
-
- $this->server->emit('beforeMethod', [$this->server->httpRequest, $this->server->httpResponse]);
-
- }
-
- /**
- * @expectedException Sabre\DAVACL\Exception\NeedPrivileges
- */
- function testBeforeBind() {
-
- $this->server->emit('beforeBind', ['testdir/file']);
-
- }
-
- /**
- * @expectedException Sabre\DAVACL\Exception\NeedPrivileges
- */
- function testBeforeUnbind() {
-
- $this->server->emit('beforeUnbind', ['testdir']);
-
- }
-
- function testPropFind() {
-
- $propFind = new DAV\PropFind('testdir', [
- '{DAV:}displayname',
- '{DAV:}getcontentlength',
- '{DAV:}bar',
- '{DAV:}owner',
- ]);
-
- $r = $this->server->emit('propFind', [$propFind, new DAV\SimpleCollection('testdir')]);
- $this->assertTrue($r);
-
- $expected = [
- 200 => [],
- 404 => [],
- 403 => [
- '{DAV:}displayname' => null,
- '{DAV:}getcontentlength' => null,
- '{DAV:}bar' => null,
- '{DAV:}owner' => null,
- ],
- ];
-
- $this->assertEquals($expected, $propFind->getResultForMultiStatus());
-
- }
-
- function testBeforeGetPropertiesNoListing() {
-
- $this->plugin->hideNodesFromListings = true;
- $propFind = new DAV\PropFind('testdir', [
- '{DAV:}displayname',
- '{DAV:}getcontentlength',
- '{DAV:}bar',
- '{DAV:}owner',
- ]);
-
- $r = $this->server->emit('propFind', [$propFind, new DAV\SimpleCollection('testdir')]);
- $this->assertFalse($r);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Exception/AceConflictTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Exception/AceConflictTest.php
deleted file mode 100644
index 1cdf2949f2e..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Exception/AceConflictTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Exception;
-
-use Sabre\DAV;
-
-class AceConflictTest extends \PHPUnit_Framework_TestCase {
-
- function testSerialize() {
-
- $ex = new AceConflict('message');
-
- $server = new DAV\Server();
- $dom = new \DOMDocument('1.0', 'utf-8');
- $root = $dom->createElementNS('DAV:', 'd:root');
- $dom->appendChild($root);
-
- $ex->serialize($server, $root);
-
- $xpaths = [
- '/d:root' => 1,
- '/d:root/d:no-ace-conflict' => 1,
- ];
-
- // Reloading because PHP DOM sucks
- $dom2 = new \DOMDocument('1.0', 'utf-8');
- $dom2->loadXML($dom->saveXML());
-
- $dxpath = new \DOMXPath($dom2);
- $dxpath->registerNamespace('d', 'DAV:');
- foreach ($xpaths as $xpath => $count) {
-
- $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : ' . $xpath . ', we could only find ' . $dxpath->query($xpath)->length . ' elements, while we expected ' . $count);
-
- }
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php
deleted file mode 100644
index b13e7722d89..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Exception/NeedPrivilegesExceptionTest.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Exception;
-
-use Sabre\DAV;
-
-class NeedPrivilegesExceptionTest extends \PHPUnit_Framework_TestCase {
-
- function testSerialize() {
-
- $uri = 'foo';
- $privileges = [
- '{DAV:}read',
- '{DAV:}write',
- ];
- $ex = new NeedPrivileges($uri, $privileges);
-
- $server = new DAV\Server();
- $dom = new \DOMDocument('1.0', 'utf-8');
- $root = $dom->createElementNS('DAV:', 'd:root');
- $dom->appendChild($root);
-
- $ex->serialize($server, $root);
-
- $xpaths = [
- '/d:root' => 1,
- '/d:root/d:need-privileges' => 1,
- '/d:root/d:need-privileges/d:resource' => 2,
- '/d:root/d:need-privileges/d:resource/d:href' => 2,
- '/d:root/d:need-privileges/d:resource/d:privilege' => 2,
- '/d:root/d:need-privileges/d:resource/d:privilege/d:read' => 1,
- '/d:root/d:need-privileges/d:resource/d:privilege/d:write' => 1,
- ];
-
- // Reloading because PHP DOM sucks
- $dom2 = new \DOMDocument('1.0', 'utf-8');
- $dom2->loadXML($dom->saveXML());
-
- $dxpath = new \DOMXPath($dom2);
- $dxpath->registerNamespace('d', 'DAV:');
- foreach ($xpaths as $xpath => $count) {
-
- $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : ' . $xpath . ', we could only find ' . $dxpath->query($xpath)->length . ' elements, while we expected ' . $count);
-
- }
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Exception/NoAbstractTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Exception/NoAbstractTest.php
deleted file mode 100644
index f52b1737140..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Exception/NoAbstractTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Exception;
-
-use Sabre\DAV;
-
-class NoAbstractTest extends \PHPUnit_Framework_TestCase {
-
- function testSerialize() {
-
- $ex = new NoAbstract('message');
-
- $server = new DAV\Server();
- $dom = new \DOMDocument('1.0', 'utf-8');
- $root = $dom->createElementNS('DAV:', 'd:root');
- $dom->appendChild($root);
-
- $ex->serialize($server, $root);
-
- $xpaths = [
- '/d:root' => 1,
- '/d:root/d:no-abstract' => 1,
- ];
-
- // Reloading because PHP DOM sucks
- $dom2 = new \DOMDocument('1.0', 'utf-8');
- $dom2->loadXML($dom->saveXML());
-
- $dxpath = new \DOMXPath($dom2);
- $dxpath->registerNamespace('d', 'DAV:');
- foreach ($xpaths as $xpath => $count) {
-
- $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : ' . $xpath . ', we could only find ' . $dxpath->query($xpath)->length . ' elements, while we expected ' . $count);
-
- }
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php
deleted file mode 100644
index df89aaf84d1..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Exception/NotRecognizedPrincipalTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Exception;
-
-use Sabre\DAV;
-
-class NotRecognizedPrincipalTest extends \PHPUnit_Framework_TestCase {
-
- function testSerialize() {
-
- $ex = new NotRecognizedPrincipal('message');
-
- $server = new DAV\Server();
- $dom = new \DOMDocument('1.0', 'utf-8');
- $root = $dom->createElementNS('DAV:', 'd:root');
- $dom->appendChild($root);
-
- $ex->serialize($server, $root);
-
- $xpaths = [
- '/d:root' => 1,
- '/d:root/d:recognized-principal' => 1,
- ];
-
- // Reloading because PHP DOM sucks
- $dom2 = new \DOMDocument('1.0', 'utf-8');
- $dom2->loadXML($dom->saveXML());
-
- $dxpath = new \DOMXPath($dom2);
- $dxpath->registerNamespace('d', 'DAV:');
- foreach ($xpaths as $xpath => $count) {
-
- $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : ' . $xpath . ', we could only find ' . $dxpath->query($xpath)->length . ' elements, while we expected ' . $count);
-
- }
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php
deleted file mode 100644
index 50623952be7..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Exception/NotSupportedPrivilegeTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Exception;
-
-use Sabre\DAV;
-
-class NotSupportedPrivilegeTest extends \PHPUnit_Framework_TestCase {
-
- function testSerialize() {
-
- $ex = new NotSupportedPrivilege('message');
-
- $server = new DAV\Server();
- $dom = new \DOMDocument('1.0', 'utf-8');
- $root = $dom->createElementNS('DAV:', 'd:root');
- $dom->appendChild($root);
-
- $ex->serialize($server, $root);
-
- $xpaths = [
- '/d:root' => 1,
- '/d:root/d:not-supported-privilege' => 1,
- ];
-
- // Reloading because PHP DOM sucks
- $dom2 = new \DOMDocument('1.0', 'utf-8');
- $dom2->loadXML($dom->saveXML());
-
- $dxpath = new \DOMXPath($dom2);
- $dxpath->registerNamespace('d', 'DAV:');
- foreach ($xpaths as $xpath => $count) {
-
- $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : ' . $xpath . ', we could only find ' . $dxpath->query($xpath)->length . ' elements, while we expected ' . $count);
-
- }
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/ExpandPropertiesTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/ExpandPropertiesTest.php
deleted file mode 100644
index 91de64372ab..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/ExpandPropertiesTest.php
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-use Sabre\DAV;
-use Sabre\HTTP;
-
-require_once 'Sabre/HTTP/ResponseMock.php';
-
-class ExpandPropertiesTest extends \PHPUnit_Framework_TestCase {
-
- function getServer() {
-
- $tree = [
- new DAV\Mock\PropertiesCollection('node1', [], [
- '{http://sabredav.org/ns}simple' => 'foo',
- '{http://sabredav.org/ns}href' => new DAV\Xml\Property\Href('node2'),
- '{DAV:}displayname' => 'Node 1',
- ]),
- new DAV\Mock\PropertiesCollection('node2', [], [
- '{http://sabredav.org/ns}simple' => 'simple',
- '{http://sabredav.org/ns}hreflist' => new DAV\Xml\Property\Href(['node1', 'node3']),
- '{DAV:}displayname' => 'Node 2',
- ]),
- new DAV\Mock\PropertiesCollection('node3', [], [
- '{http://sabredav.org/ns}simple' => 'simple',
- '{DAV:}displayname' => 'Node 3',
- ]),
- ];
-
- $fakeServer = new DAV\Server($tree);
- $fakeServer->sapi = new HTTP\SapiMock();
- $fakeServer->debugExceptions = true;
- $fakeServer->httpResponse = new HTTP\ResponseMock();
- $plugin = new Plugin();
- $plugin->allowUnauthenticatedAccess = false;
- // Anyone can do anything
- $plugin->setDefaultACL([
- [
- 'principal' => '{DAV:}all',
- 'privilege' => '{DAV:}all',
- ]
- ]);
- $this->assertTrue($plugin instanceof Plugin);
-
- $fakeServer->addPlugin($plugin);
- $this->assertEquals($plugin, $fakeServer->getPlugin('acl'));
-
- return $fakeServer;
-
- }
-
- function testSimple() {
-
- $xml = '<?xml version="1.0"?>
-<d:expand-property xmlns:d="DAV:">
- <d:property name="displayname" />
- <d:property name="foo" namespace="http://www.sabredav.org/NS/2010/nonexistant" />
- <d:property name="simple" namespace="http://sabredav.org/ns" />
- <d:property name="href" namespace="http://sabredav.org/ns" />
-</d:expand-property>';
-
- $serverVars = [
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_DEPTH' => '0',
- 'REQUEST_URI' => '/node1',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody($xml);
-
- $server = $this->getServer();
- $server->httpRequest = $request;
-
- $server->exec();
-
- $this->assertEquals(207, $server->httpResponse->status, 'Incorrect status code received. Full body: ' . $server->httpResponse->body);
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $server->httpResponse->getHeaders());
-
-
- $check = [
- '/d:multistatus',
- '/d:multistatus/d:response' => 1,
- '/d:multistatus/d:response/d:href' => 1,
- '/d:multistatus/d:response/d:propstat' => 2,
- '/d:multistatus/d:response/d:propstat/d:prop' => 2,
- '/d:multistatus/d:response/d:propstat/d:prop/d:displayname' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop/s:simple' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop/s:href' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:href' => 1,
- ];
-
- $xml = simplexml_load_string($server->httpResponse->body);
- $xml->registerXPathNamespace('d', 'DAV:');
- $xml->registerXPathNamespace('s', 'http://sabredav.org/ns');
- foreach ($check as $v1 => $v2) {
-
- $xpath = is_int($v1) ? $v2 : $v1;
-
- $result = $xml->xpath($xpath);
-
- $count = 1;
- if (!is_int($v1)) $count = $v2;
-
- $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . '. Full response: ' . $server->httpResponse->body);
-
- }
-
- }
-
- /**
- * @depends testSimple
- */
- function testExpand() {
-
- $xml = '<?xml version="1.0"?>
-<d:expand-property xmlns:d="DAV:">
- <d:property name="href" namespace="http://sabredav.org/ns">
- <d:property name="displayname" />
- </d:property>
-</d:expand-property>';
-
- $serverVars = [
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_DEPTH' => '0',
- 'REQUEST_URI' => '/node1',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody($xml);
-
- $server = $this->getServer();
- $server->httpRequest = $request;
-
- $server->exec();
-
- $this->assertEquals(207, $server->httpResponse->status, 'Incorrect response status received. Full response body: ' . $server->httpResponse->body);
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $server->httpResponse->getHeaders());
-
-
- $check = [
- '/d:multistatus',
- '/d:multistatus/d:response' => 1,
- '/d:multistatus/d:response/d:href' => 1,
- '/d:multistatus/d:response/d:propstat' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop/s:href' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response/d:href' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response/d:propstat' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response/d:propstat/d:prop' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop/s:href/d:response/d:propstat/d:prop/d:displayname' => 1,
- ];
-
- $xml = simplexml_load_string($server->httpResponse->body);
- $xml->registerXPathNamespace('d', 'DAV:');
- $xml->registerXPathNamespace('s', 'http://sabredav.org/ns');
- foreach ($check as $v1 => $v2) {
-
- $xpath = is_int($v1) ? $v2 : $v1;
-
- $result = $xml->xpath($xpath);
-
- $count = 1;
- if (!is_int($v1)) $count = $v2;
-
- $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . ' Full response body: ' . $server->httpResponse->getBodyAsString());
-
- }
-
- }
-
- /**
- * @depends testSimple
- */
- function testExpandHrefList() {
-
- $xml = '<?xml version="1.0"?>
-<d:expand-property xmlns:d="DAV:">
- <d:property name="hreflist" namespace="http://sabredav.org/ns">
- <d:property name="displayname" />
- </d:property>
-</d:expand-property>';
-
- $serverVars = [
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_DEPTH' => '0',
- 'REQUEST_URI' => '/node2',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody($xml);
-
- $server = $this->getServer();
- $server->httpRequest = $request;
-
- $server->exec();
-
- $this->assertEquals(207, $server->httpResponse->status);
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $server->httpResponse->getHeaders());
-
-
- $check = [
- '/d:multistatus',
- '/d:multistatus/d:response' => 1,
- '/d:multistatus/d:response/d:href' => 1,
- '/d:multistatus/d:response/d:propstat' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response' => 2,
- '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:href' => 2,
- '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat' => 2,
- '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop' => 2,
- '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/d:displayname' => 2,
- ];
-
- $xml = simplexml_load_string($server->httpResponse->body);
- $xml->registerXPathNamespace('d', 'DAV:');
- $xml->registerXPathNamespace('s', 'http://sabredav.org/ns');
- foreach ($check as $v1 => $v2) {
-
- $xpath = is_int($v1) ? $v2 : $v1;
-
- $result = $xml->xpath($xpath);
-
- $count = 1;
- if (!is_int($v1)) $count = $v2;
-
- $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result));
-
- }
-
- }
-
- /**
- * @depends testExpand
- */
- function testExpandDeep() {
-
- $xml = '<?xml version="1.0"?>
-<d:expand-property xmlns:d="DAV:">
- <d:property name="hreflist" namespace="http://sabredav.org/ns">
- <d:property name="href" namespace="http://sabredav.org/ns">
- <d:property name="displayname" />
- </d:property>
- <d:property name="displayname" />
- </d:property>
-</d:expand-property>';
-
- $serverVars = [
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_DEPTH' => '0',
- 'REQUEST_URI' => '/node2',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody($xml);
-
- $server = $this->getServer();
- $server->httpRequest = $request;
-
- $server->exec();
-
- $this->assertEquals(207, $server->httpResponse->status);
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $server->httpResponse->getHeaders());
-
-
- $check = [
- '/d:multistatus',
- '/d:multistatus/d:response' => 1,
- '/d:multistatus/d:response/d:href' => 1,
- '/d:multistatus/d:response/d:propstat' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response' => 2,
- '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:href' => 2,
- '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat' => 3,
- '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop' => 3,
- '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/d:displayname' => 2,
- '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href' => 2,
- '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response/d:href' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response/d:propstat' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response/d:propstat/d:prop' => 1,
- '/d:multistatus/d:response/d:propstat/d:prop/s:hreflist/d:response/d:propstat/d:prop/s:href/d:response/d:propstat/d:prop/d:displayname' => 1,
- ];
-
- $xml = simplexml_load_string($server->httpResponse->body);
- $xml->registerXPathNamespace('d', 'DAV:');
- $xml->registerXPathNamespace('s', 'http://sabredav.org/ns');
- foreach ($check as $v1 => $v2) {
-
- $xpath = is_int($v1) ? $v2 : $v1;
-
- $result = $xml->xpath($xpath);
-
- $count = 1;
- if (!is_int($v1)) $count = $v2;
-
- $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result));
-
- }
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/FS/CollectionTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/FS/CollectionTest.php
deleted file mode 100644
index af18e7cc057..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/FS/CollectionTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\FS;
-
-class CollectionTest extends FileTest {
-
- function setUp() {
-
- $this->path = SABRE_TEMPDIR;
- $this->sut = new Collection($this->path, $this->acl, $this->owner);
-
- }
-
- function tearDown() {
-
- \Sabre\TestUtil::clearTempDir();
-
- }
-
- function testGetChildFile() {
-
- file_put_contents(SABRE_TEMPDIR . '/file.txt', 'hello');
- $child = $this->sut->getChild('file.txt');
- $this->assertInstanceOf('Sabre\\DAVACL\\FS\\File', $child);
-
- $this->assertEquals('file.txt', $child->getName());
- $this->assertEquals($this->acl, $child->getACL());
- $this->assertEquals($this->owner, $child->getOwner());
-
- }
-
- function testGetChildDirectory() {
-
- mkdir(SABRE_TEMPDIR . '/dir');
- $child = $this->sut->getChild('dir');
- $this->assertInstanceOf('Sabre\\DAVACL\\FS\\Collection', $child);
-
- $this->assertEquals('dir', $child->getName());
- $this->assertEquals($this->acl, $child->getACL());
- $this->assertEquals($this->owner, $child->getOwner());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/FS/FileTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/FS/FileTest.php
deleted file mode 100644
index f57b2fa1d16..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/FS/FileTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\FS;
-
-class FileTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * System under test
- *
- * @var File
- */
- protected $sut;
-
- protected $path = 'foo';
- protected $acl = [
- [
- 'privilege' => '{DAV:}read',
- 'principal' => '{DAV:}authenticated',
- ]
- ];
-
- protected $owner = 'principals/evert';
-
- function setUp() {
-
- $this->sut = new File($this->path, $this->acl, $this->owner);
-
- }
-
- function testGetOwner() {
-
- $this->assertEquals(
- $this->owner,
- $this->sut->getOwner()
- );
-
- }
-
- function testGetGroup() {
-
- $this->assertNull(
- $this->sut->getGroup()
- );
-
- }
-
- function testGetACL() {
-
- $this->assertEquals(
- $this->acl,
- $this->sut->getACL()
- );
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\Forbidden
- */
- function testSetAcl() {
-
- $this->sut->setACL([]);
-
- }
-
- function testGetSupportedPrivilegeSet() {
-
- $this->assertNull(
- $this->sut->getSupportedPrivilegeSet()
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/FS/HomeCollectionTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/FS/HomeCollectionTest.php
deleted file mode 100644
index 87cfc83e92c..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/FS/HomeCollectionTest.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\FS;
-
-use Sabre\DAVACL\PrincipalBackend\Mock as PrincipalBackend;
-
-class HomeCollectionTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * System under test
- *
- * @var HomeCollection
- */
- protected $sut;
-
- protected $path;
- protected $name = 'thuis';
-
- function setUp() {
-
- $principalBackend = new PrincipalBackend();
-
- $this->path = SABRE_TEMPDIR . '/home';
-
- $this->sut = new HomeCollection($principalBackend, $this->path);
- $this->sut->collectionName = $this->name;
-
-
- }
-
- function tearDown() {
-
- \Sabre\TestUtil::clearTempDir();
-
- }
-
- function testGetName() {
-
- $this->assertEquals(
- $this->name,
- $this->sut->getName()
- );
-
- }
-
- function testGetChild() {
-
- $child = $this->sut->getChild('user1');
- $this->assertInstanceOf('Sabre\\DAVACL\\FS\\Collection', $child);
- $this->assertEquals('user1', $child->getName());
-
- $owner = 'principals/user1';
- $acl = [
- [
- 'privilege' => '{DAV:}all',
- 'principal' => '{DAV:}owner',
- 'protected' => true,
- ],
- ];
-
- $this->assertEquals($acl, $child->getACL());
- $this->assertEquals($owner, $child->getOwner());
-
- }
-
- function testGetOwner() {
-
- $this->assertNull(
- $this->sut->getOwner()
- );
-
- }
-
- function testGetGroup() {
-
- $this->assertNull(
- $this->sut->getGroup()
- );
-
- }
-
- function testGetACL() {
-
- $acl = [
- [
- 'principal' => '{DAV:}authenticated',
- 'privilege' => '{DAV:}read',
- 'protected' => true,
- ]
- ];
-
- $this->assertEquals(
- $acl,
- $this->sut->getACL()
- );
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\Forbidden
- */
- function testSetAcl() {
-
- $this->sut->setACL([]);
-
- }
-
- function testGetSupportedPrivilegeSet() {
-
- $this->assertNull(
- $this->sut->getSupportedPrivilegeSet()
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/MockACLNode.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/MockACLNode.php
deleted file mode 100644
index 2d9744e293f..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/MockACLNode.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-use Sabre\DAV;
-
-class MockACLNode extends DAV\Node implements IACL {
-
- public $name;
- public $acl;
-
- function __construct($name, array $acl = []) {
-
- $this->name = $name;
- $this->acl = $acl;
-
- }
-
- function getName() {
-
- return $this->name;
-
- }
-
- function getOwner() {
-
- return null;
-
- }
-
- function getGroup() {
-
- return null;
-
- }
-
- function getACL() {
-
- return $this->acl;
-
- }
-
- function setACL(array $acl) {
-
- $this->acl = $acl;
-
- }
-
- function getSupportedPrivilegeSet() {
-
- return null;
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/MockPrincipal.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/MockPrincipal.php
deleted file mode 100644
index 934906802ed..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/MockPrincipal.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-use Sabre\DAV;
-
-class MockPrincipal extends DAV\Node implements IPrincipal {
-
- public $name;
- public $principalUrl;
- public $groupMembership = [];
- public $groupMemberSet = [];
-
- function __construct($name, $principalUrl, array $groupMembership = [], array $groupMemberSet = []) {
-
- $this->name = $name;
- $this->principalUrl = $principalUrl;
- $this->groupMembership = $groupMembership;
- $this->groupMemberSet = $groupMemberSet;
-
- }
-
- function getName() {
-
- return $this->name;
-
- }
-
- function getDisplayName() {
-
- return $this->getName();
-
- }
-
- function getAlternateUriSet() {
-
- return [];
-
- }
-
- function getPrincipalUrl() {
-
- return $this->principalUrl;
-
- }
-
- function getGroupMemberSet() {
-
- return $this->groupMemberSet;
-
- }
-
- function getGroupMemberShip() {
-
- return $this->groupMembership;
-
- }
-
- function setGroupMemberSet(array $groupMemberSet) {
-
- $this->groupMemberSet = $groupMemberSet;
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PluginAdminTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PluginAdminTest.php
deleted file mode 100644
index 8552448f54b..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PluginAdminTest.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-use Sabre\DAV;
-use Sabre\HTTP;
-
-require_once 'Sabre/DAVACL/MockACLNode.php';
-require_once 'Sabre/HTTP/ResponseMock.php';
-
-class PluginAdminTest extends \PHPUnit_Framework_TestCase {
-
- public $server;
-
- function setUp() {
-
- $principalBackend = new PrincipalBackend\Mock();
-
- $tree = [
- new MockACLNode('adminonly', []),
- new PrincipalCollection($principalBackend),
- ];
-
- $this->server = new DAV\Server($tree);
- $this->server->sapi = new HTTP\SapiMock();
- $plugin = new DAV\Auth\Plugin(new DAV\Auth\Backend\Mock());
- $this->server->addPlugin($plugin);
- }
-
- function testNoAdminAccess() {
-
- $plugin = new Plugin();
- $this->server->addPlugin($plugin);
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'OPTIONS',
- 'HTTP_DEPTH' => 1,
- 'REQUEST_URI' => '/adminonly',
- ]);
-
- $response = new HTTP\ResponseMock();
-
- $this->server->httpRequest = $request;
- $this->server->httpResponse = $response;
-
- $this->server->exec();
-
- $this->assertEquals(403, $response->status);
-
- }
-
- /**
- * @depends testNoAdminAccess
- */
- function testAdminAccess() {
-
- $plugin = new Plugin();
- $plugin->adminPrincipals = [
- 'principals/admin',
- ];
- $this->server->addPlugin($plugin);
-
- $request = HTTP\Sapi::createFromServerArray([
- 'REQUEST_METHOD' => 'OPTIONS',
- 'HTTP_DEPTH' => 1,
- 'REQUEST_URI' => '/adminonly',
- ]);
-
- $response = new HTTP\ResponseMock();
-
- $this->server->httpRequest = $request;
- $this->server->httpResponse = $response;
-
- $this->server->exec();
-
- $this->assertEquals(200, $response->status);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PluginPropertiesTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PluginPropertiesTest.php
deleted file mode 100644
index fb42efba719..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PluginPropertiesTest.php
+++ /dev/null
@@ -1,415 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-use Sabre\DAV;
-use Sabre\HTTP;
-
-class PluginPropertiesTest extends \PHPUnit_Framework_TestCase {
-
- function testPrincipalCollectionSet() {
-
- $plugin = new Plugin();
- $plugin->allowUnauthenticatedAccess = false;
- $plugin->setDefaultACL([
- [
- 'principal' => '{DAV:}all',
- 'privilege' => '{DAV:}all',
- ],
- ]);
- //Anyone can do anything
- $plugin->principalCollectionSet = [
- 'principals1',
- 'principals2',
- ];
-
- $requestedProperties = [
- '{DAV:}principal-collection-set',
- ];
-
- $server = new DAV\Server(new DAV\SimpleCollection('root'));
- $server->addPlugin($plugin);
-
- $result = $server->getPropertiesForPath('', $requestedProperties);
- $result = $result[0];
-
- $this->assertEquals(1, count($result[200]));
- $this->assertArrayHasKey('{DAV:}principal-collection-set', $result[200]);
- $this->assertInstanceOf('Sabre\\DAV\\Xml\\Property\\Href', $result[200]['{DAV:}principal-collection-set']);
-
- $expected = [
- 'principals1/',
- 'principals2/',
- ];
-
-
- $this->assertEquals($expected, $result[200]['{DAV:}principal-collection-set']->getHrefs());
-
-
- }
-
- function testCurrentUserPrincipal() {
-
- $fakeServer = new DAV\Server();
- $plugin = new DAV\Auth\Plugin(new DAV\Auth\Backend\Mock());
- $fakeServer->addPlugin($plugin);
- $plugin = new Plugin();
- $plugin->setDefaultACL([
- [
- 'principal' => '{DAV:}all',
- 'privilege' => '{DAV:}all',
- ],
- ]);
- $fakeServer->addPlugin($plugin);
-
-
- $requestedProperties = [
- '{DAV:}current-user-principal',
- ];
-
- $result = $fakeServer->getPropertiesForPath('', $requestedProperties);
- $result = $result[0];
-
- $this->assertEquals(1, count($result[200]));
- $this->assertArrayHasKey('{DAV:}current-user-principal', $result[200]);
- $this->assertInstanceOf('Sabre\DAVACL\Xml\Property\Principal', $result[200]['{DAV:}current-user-principal']);
- $this->assertEquals(Xml\Property\Principal::UNAUTHENTICATED, $result[200]['{DAV:}current-user-principal']->getType());
-
- // This will force the login
- $fakeServer->emit('beforeMethod', [$fakeServer->httpRequest, $fakeServer->httpResponse]);
-
- $result = $fakeServer->getPropertiesForPath('', $requestedProperties);
- $result = $result[0];
-
- $this->assertEquals(1, count($result[200]));
- $this->assertArrayHasKey('{DAV:}current-user-principal', $result[200]);
- $this->assertInstanceOf('Sabre\DAVACL\Xml\Property\Principal', $result[200]['{DAV:}current-user-principal']);
- $this->assertEquals(Xml\Property\Principal::HREF, $result[200]['{DAV:}current-user-principal']->getType());
- $this->assertEquals('principals/admin/', $result[200]['{DAV:}current-user-principal']->getHref());
-
- }
-
- function testSupportedPrivilegeSet() {
-
- $plugin = new Plugin();
- $plugin->allowUnauthenticatedAccess = false;
- $plugin->setDefaultACL([
- [
- 'principal' => '{DAV:}all',
- 'privilege' => '{DAV:}all',
- ],
- ]);
- $server = new DAV\Server();
- $server->addPlugin($plugin);
-
- $requestedProperties = [
- '{DAV:}supported-privilege-set',
- ];
-
- $result = $server->getPropertiesForPath('', $requestedProperties);
- $result = $result[0];
-
- $this->assertEquals(1, count($result[200]));
- $this->assertArrayHasKey('{DAV:}supported-privilege-set', $result[200]);
- $this->assertInstanceOf('Sabre\\DAVACL\\Xml\\Property\\SupportedPrivilegeSet', $result[200]['{DAV:}supported-privilege-set']);
-
- $server = new DAV\Server();
-
- $prop = $result[200]['{DAV:}supported-privilege-set'];
- $result = $server->xml->write('{DAV:}root', $prop);
-
- $xpaths = [
- '/d:root' => 1,
- '/d:root/d:supported-privilege' => 1,
- '/d:root/d:supported-privilege/d:privilege' => 1,
- '/d:root/d:supported-privilege/d:privilege/d:all' => 1,
- '/d:root/d:supported-privilege/d:abstract' => 0,
- '/d:root/d:supported-privilege/d:supported-privilege' => 2,
- '/d:root/d:supported-privilege/d:supported-privilege/d:privilege' => 2,
- '/d:root/d:supported-privilege/d:supported-privilege/d:privilege/d:read' => 1,
- '/d:root/d:supported-privilege/d:supported-privilege/d:privilege/d:write' => 1,
- '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege' => 7,
- '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege' => 7,
- '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:read-acl' => 1,
- '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:read-current-user-privilege-set' => 1,
- '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:write-content' => 1,
- '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:write-properties' => 1,
- '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:bind' => 1,
- '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:unbind' => 1,
- '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:privilege/d:unlock' => 1,
- '/d:root/d:supported-privilege/d:supported-privilege/d:supported-privilege/d:abstract' => 0,
- ];
-
-
- // reloading because php dom sucks
- $dom2 = new \DOMDocument('1.0', 'utf-8');
- $dom2->loadXML($result);
-
- $dxpath = new \DOMXPath($dom2);
- $dxpath->registerNamespace('d', 'DAV:');
- foreach ($xpaths as $xpath => $count) {
-
- $this->assertEquals($count, $dxpath->query($xpath)->length, 'Looking for : ' . $xpath . ', we could only find ' . $dxpath->query($xpath)->length . ' elements, while we expected ' . $count . ' Full XML: ' . $result);
-
- }
-
- }
-
- function testACL() {
-
- $plugin = new Plugin();
- $plugin->allowUnauthenticatedAccess = false;
- $plugin->setDefaultACL([
- [
- 'principal' => '{DAV:}all',
- 'privilege' => '{DAV:}all',
- ],
- ]);
-
- $nodes = [
- new MockACLNode('foo', [
- [
- 'principal' => 'principals/admin',
- 'privilege' => '{DAV:}read',
- ]
- ]),
- new DAV\SimpleCollection('principals', [
- $principal = new MockPrincipal('admin', 'principals/admin'),
- ]),
-
- ];
-
- $server = new DAV\Server($nodes);
- $server->addPlugin($plugin);
- $authPlugin = new DAV\Auth\Plugin(new DAV\Auth\Backend\Mock());
- $server->addPlugin($authPlugin);
-
- // Force login
- $authPlugin->beforeMethod(new HTTP\Request(), new HTTP\Response());
-
- $requestedProperties = [
- '{DAV:}acl',
- ];
-
- $result = $server->getPropertiesForPath('foo', $requestedProperties);
- $result = $result[0];
-
- $this->assertEquals(1, count($result[200]), 'The {DAV:}acl property did not return from the list. Full list: ' . print_r($result, true));
- $this->assertArrayHasKey('{DAV:}acl', $result[200]);
- $this->assertInstanceOf('Sabre\\DAVACL\\Xml\Property\\Acl', $result[200]['{DAV:}acl']);
-
- }
-
- function testACLRestrictions() {
-
- $plugin = new Plugin();
- $plugin->allowUnauthenticatedAccess = false;
-
- $nodes = [
- new MockACLNode('foo', [
- [
- 'principal' => 'principals/admin',
- 'privilege' => '{DAV:}read',
- ]
- ]),
- new DAV\SimpleCollection('principals', [
- $principal = new MockPrincipal('admin', 'principals/admin'),
- ]),
-
- ];
-
- $server = new DAV\Server($nodes);
- $server->addPlugin($plugin);
- $authPlugin = new DAV\Auth\Plugin(new DAV\Auth\Backend\Mock());
- $server->addPlugin($authPlugin);
-
- // Force login
- $authPlugin->beforeMethod(new HTTP\Request(), new HTTP\Response());
-
- $requestedProperties = [
- '{DAV:}acl-restrictions',
- ];
-
- $result = $server->getPropertiesForPath('foo', $requestedProperties);
- $result = $result[0];
-
- $this->assertEquals(1, count($result[200]), 'The {DAV:}acl-restrictions property did not return from the list. Full list: ' . print_r($result, true));
- $this->assertArrayHasKey('{DAV:}acl-restrictions', $result[200]);
- $this->assertInstanceOf('Sabre\\DAVACL\\Xml\\Property\\AclRestrictions', $result[200]['{DAV:}acl-restrictions']);
-
- }
-
- function testAlternateUriSet() {
-
- $tree = [
- new DAV\SimpleCollection('principals', [
- $principal = new MockPrincipal('user', 'principals/user'),
- ])
- ];
-
- $fakeServer = new DAV\Server($tree);
- //$plugin = new DAV\Auth\Plugin(new DAV\Auth\MockBackend())
- //$fakeServer->addPlugin($plugin);
- $plugin = new Plugin();
- $plugin->allowUnauthenticatedAccess = false;
- $plugin->setDefaultACL([
- [
- 'principal' => '{DAV:}all',
- 'privilege' => '{DAV:}all',
- ],
- ]);
- $fakeServer->addPlugin($plugin);
-
- $requestedProperties = [
- '{DAV:}alternate-URI-set',
- ];
- $result = $fakeServer->getPropertiesForPath('principals/user', $requestedProperties);
- $result = $result[0];
-
- $this->assertTrue(isset($result[200]));
- $this->assertTrue(isset($result[200]['{DAV:}alternate-URI-set']));
- $this->assertInstanceOf('Sabre\\DAV\\Xml\\Property\\Href', $result[200]['{DAV:}alternate-URI-set']);
-
- $this->assertEquals([], $result[200]['{DAV:}alternate-URI-set']->getHrefs());
-
- }
-
- function testPrincipalURL() {
-
- $tree = [
- new DAV\SimpleCollection('principals', [
- $principal = new MockPrincipal('user', 'principals/user'),
- ]),
- ];
-
- $fakeServer = new DAV\Server($tree);
- //$plugin = new DAV\Auth\Plugin(new DAV\Auth\MockBackend());
- //$fakeServer->addPlugin($plugin);
- $plugin = new Plugin();
- $plugin->allowUnauthenticatedAccess = false;
- $plugin->setDefaultACL([
- [
- 'principal' => '{DAV:}all',
- 'privilege' => '{DAV:}all',
- ],
- ]);
- $fakeServer->addPlugin($plugin);
-
- $requestedProperties = [
- '{DAV:}principal-URL',
- ];
-
- $result = $fakeServer->getPropertiesForPath('principals/user', $requestedProperties);
- $result = $result[0];
-
- $this->assertTrue(isset($result[200]));
- $this->assertTrue(isset($result[200]['{DAV:}principal-URL']));
- $this->assertInstanceOf('Sabre\\DAV\\Xml\\Property\\Href', $result[200]['{DAV:}principal-URL']);
-
- $this->assertEquals('principals/user/', $result[200]['{DAV:}principal-URL']->getHref());
-
- }
-
- function testGroupMemberSet() {
-
- $tree = [
- new DAV\SimpleCollection('principals', [
- $principal = new MockPrincipal('user', 'principals/user'),
- ]),
- ];
-
- $fakeServer = new DAV\Server($tree);
- //$plugin = new DAV\Auth\Plugin(new DAV\Auth\MockBackend());
- //$fakeServer->addPlugin($plugin);
- $plugin = new Plugin();
- $plugin->allowUnauthenticatedAccess = false;
- $plugin->setDefaultACL([
- [
- 'principal' => '{DAV:}all',
- 'privilege' => '{DAV:}all',
- ],
- ]);
- $fakeServer->addPlugin($plugin);
-
- $requestedProperties = [
- '{DAV:}group-member-set',
- ];
-
- $result = $fakeServer->getPropertiesForPath('principals/user', $requestedProperties);
- $result = $result[0];
-
- $this->assertTrue(isset($result[200]));
- $this->assertTrue(isset($result[200]['{DAV:}group-member-set']));
- $this->assertInstanceOf('Sabre\\DAV\\Xml\\Property\\Href', $result[200]['{DAV:}group-member-set']);
-
- $this->assertEquals([], $result[200]['{DAV:}group-member-set']->getHrefs());
-
- }
-
- function testGroupMemberShip() {
-
- $tree = [
- new DAV\SimpleCollection('principals', [
- $principal = new MockPrincipal('user', 'principals/user'),
- ]),
- ];
-
- $fakeServer = new DAV\Server($tree);
- $plugin = new Plugin();
- $plugin->allowUnauthenticatedAccess = false;
- $fakeServer->addPlugin($plugin);
- $plugin->setDefaultACL([
- [
- 'principal' => '{DAV:}all',
- 'privilege' => '{DAV:}all',
- ],
- ]);
-
- $requestedProperties = [
- '{DAV:}group-membership',
- ];
-
- $result = $fakeServer->getPropertiesForPath('principals/user', $requestedProperties);
- $result = $result[0];
-
- $this->assertTrue(isset($result[200]));
- $this->assertTrue(isset($result[200]['{DAV:}group-membership']));
- $this->assertInstanceOf('Sabre\\DAV\\Xml\\Property\\Href', $result[200]['{DAV:}group-membership']);
-
- $this->assertEquals([], $result[200]['{DAV:}group-membership']->getHrefs());
-
- }
-
- function testGetDisplayName() {
-
- $tree = [
- new DAV\SimpleCollection('principals', [
- $principal = new MockPrincipal('user', 'principals/user'),
- ]),
- ];
-
- $fakeServer = new DAV\Server($tree);
- $plugin = new Plugin();
- $plugin->allowUnauthenticatedAccess = false;
- $fakeServer->addPlugin($plugin);
- $plugin->setDefaultACL([
- [
- 'principal' => '{DAV:}all',
- 'privilege' => '{DAV:}all',
- ],
- ]);
-
- $requestedProperties = [
- '{DAV:}displayname',
- ];
-
- $result = $fakeServer->getPropertiesForPath('principals/user', $requestedProperties);
- $result = $result[0];
-
- $this->assertTrue(isset($result[200]));
- $this->assertTrue(isset($result[200]['{DAV:}displayname']));
-
- $this->assertEquals('user', $result[200]['{DAV:}displayname']);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php
deleted file mode 100644
index 0147e6a6177..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PluginUpdatePropertiesTest.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-use Sabre\DAV;
-
-class PluginUpdatePropertiesTest extends \PHPUnit_Framework_TestCase {
-
- function testUpdatePropertiesPassthrough() {
-
- $tree = [
- new DAV\SimpleCollection('foo'),
- ];
- $server = new DAV\Server($tree);
- $server->addPlugin(new DAV\Auth\Plugin());
- $server->addPlugin(new Plugin());
-
- $result = $server->updateProperties('foo', [
- '{DAV:}foo' => 'bar',
- ]);
-
- $expected = [
- '{DAV:}foo' => 403,
- ];
-
- $this->assertEquals($expected, $result);
-
- }
-
- function testRemoveGroupMembers() {
-
- $tree = [
- new MockPrincipal('foo', 'foo'),
- ];
- $server = new DAV\Server($tree);
- $plugin = new Plugin();
- $plugin->allowUnauthenticatedAccess = false;
- $server->addPlugin($plugin);
-
- $result = $server->updateProperties('foo', [
- '{DAV:}group-member-set' => null,
- ]);
-
- $expected = [
- '{DAV:}group-member-set' => 204
- ];
-
- $this->assertEquals($expected, $result);
- $this->assertEquals([], $tree[0]->getGroupMemberSet());
-
- }
-
- function testSetGroupMembers() {
-
- $tree = [
- new MockPrincipal('foo', 'foo'),
- ];
- $server = new DAV\Server($tree);
- $plugin = new Plugin();
- $plugin->allowUnauthenticatedAccess = false;
- $server->addPlugin($plugin);
-
- $result = $server->updateProperties('foo', [
- '{DAV:}group-member-set' => new DAV\Xml\Property\Href(['/bar', '/baz'], true),
- ]);
-
- $expected = [
- '{DAV:}group-member-set' => 200
- ];
-
- $this->assertEquals($expected, $result);
- $this->assertEquals(['bar', 'baz'], $tree[0]->getGroupMemberSet());
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception
- */
- function testSetBadValue() {
-
- $tree = [
- new MockPrincipal('foo', 'foo'),
- ];
- $server = new DAV\Server($tree);
- $plugin = new Plugin();
- $plugin->allowUnauthenticatedAccess = false;
- $server->addPlugin($plugin);
-
- $result = $server->updateProperties('foo', [
- '{DAV:}group-member-set' => new \StdClass(),
- ]);
-
- }
-
- function testSetBadNode() {
-
- $tree = [
- new DAV\SimpleCollection('foo'),
- ];
- $server = new DAV\Server($tree);
- $plugin = new Plugin();
- $plugin->allowUnauthenticatedAccess = false;
- $server->addPlugin($plugin);
-
- $result = $server->updateProperties('foo', [
- '{DAV:}group-member-set' => new DAV\Xml\Property\Href(['/bar', '/baz'], false),
- ]);
-
- $expected = [
- '{DAV:}group-member-set' => 403,
- ];
-
- $this->assertEquals($expected, $result);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
deleted file mode 100644
index 9fef3018df9..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/AbstractPDOTest.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\PrincipalBackend;
-
-use Sabre\DAV;
-use Sabre\HTTP;
-
-abstract class AbstractPDOTest extends \PHPUnit_Framework_TestCase {
-
- use DAV\DbTestHelperTrait;
-
- function setUp() {
-
- $this->dropTables(['principals', 'groupmembers']);
- $this->createSchema('principals');
-
- $pdo = $this->getPDO();
-
- $pdo->query("INSERT INTO principals (uri,email,displayname) VALUES ('principals/user','user@example.org','User')");
- $pdo->query("INSERT INTO principals (uri,email,displayname) VALUES ('principals/group','group@example.org','Group')");
-
- $pdo->query("INSERT INTO groupmembers (principal_id,member_id) VALUES (5,4)");
-
- }
-
-
- function testConstruct() {
-
- $pdo = $this->getPDO();
- $backend = new PDO($pdo);
- $this->assertTrue($backend instanceof PDO);
-
- }
-
- /**
- * @depends testConstruct
- */
- function testGetPrincipalsByPrefix() {
-
- $pdo = $this->getPDO();
- $backend = new PDO($pdo);
-
- $expected = [
- [
- 'uri' => 'principals/admin',
- '{http://sabredav.org/ns}email-address' => 'admin@example.org',
- '{DAV:}displayname' => 'Administrator',
- ],
- [
- 'uri' => 'principals/user',
- '{http://sabredav.org/ns}email-address' => 'user@example.org',
- '{DAV:}displayname' => 'User',
- ],
- [
- 'uri' => 'principals/group',
- '{http://sabredav.org/ns}email-address' => 'group@example.org',
- '{DAV:}displayname' => 'Group',
- ],
- ];
-
- $this->assertEquals($expected, $backend->getPrincipalsByPrefix('principals'));
- $this->assertEquals([], $backend->getPrincipalsByPrefix('foo'));
-
- }
-
- /**
- * @depends testConstruct
- */
- function testGetPrincipalByPath() {
-
- $pdo = $this->getPDO();
- $backend = new PDO($pdo);
-
- $expected = [
- 'id' => 4,
- 'uri' => 'principals/user',
- '{http://sabredav.org/ns}email-address' => 'user@example.org',
- '{DAV:}displayname' => 'User',
- ];
-
- $this->assertEquals($expected, $backend->getPrincipalByPath('principals/user'));
- $this->assertEquals(null, $backend->getPrincipalByPath('foo'));
-
- }
-
- function testGetGroupMemberSet() {
-
- $pdo = $this->getPDO();
- $backend = new PDO($pdo);
- $expected = ['principals/user'];
-
- $this->assertEquals($expected, $backend->getGroupMemberSet('principals/group'));
-
- }
-
- function testGetGroupMembership() {
-
- $pdo = $this->getPDO();
- $backend = new PDO($pdo);
- $expected = ['principals/group'];
-
- $this->assertEquals($expected, $backend->getGroupMembership('principals/user'));
-
- }
-
- function testSetGroupMemberSet() {
-
- $pdo = $this->getPDO();
-
- // Start situation
- $backend = new PDO($pdo);
- $this->assertEquals(['principals/user'], $backend->getGroupMemberSet('principals/group'));
-
- // Removing all principals
- $backend->setGroupMemberSet('principals/group', []);
- $this->assertEquals([], $backend->getGroupMemberSet('principals/group'));
-
- // Adding principals again
- $backend->setGroupMemberSet('principals/group', ['principals/user']);
- $this->assertEquals(['principals/user'], $backend->getGroupMemberSet('principals/group'));
-
-
- }
-
- function testSearchPrincipals() {
-
- $pdo = $this->getPDO();
-
- $backend = new PDO($pdo);
-
- $result = $backend->searchPrincipals('principals', ['{DAV:}blabla' => 'foo']);
- $this->assertEquals([], $result);
-
- $result = $backend->searchPrincipals('principals', ['{DAV:}displayname' => 'ou']);
- $this->assertEquals(['principals/group'], $result);
-
- $result = $backend->searchPrincipals('principals', ['{DAV:}displayname' => 'UsEr', '{http://sabredav.org/ns}email-address' => 'USER@EXAMPLE']);
- $this->assertEquals(['principals/user'], $result);
-
- $result = $backend->searchPrincipals('mom', ['{DAV:}displayname' => 'UsEr', '{http://sabredav.org/ns}email-address' => 'USER@EXAMPLE']);
- $this->assertEquals([], $result);
-
- }
-
- function testUpdatePrincipal() {
-
- $pdo = $this->getPDO();
- $backend = new PDO($pdo);
-
- $propPatch = new DAV\PropPatch([
- '{DAV:}displayname' => 'pietje',
- ]);
-
- $backend->updatePrincipal('principals/user', $propPatch);
- $result = $propPatch->commit();
-
- $this->assertTrue($result);
-
- $this->assertEquals([
- 'id' => 4,
- 'uri' => 'principals/user',
- '{DAV:}displayname' => 'pietje',
- '{http://sabredav.org/ns}email-address' => 'user@example.org',
- ], $backend->getPrincipalByPath('principals/user'));
-
- }
-
- function testUpdatePrincipalUnknownField() {
-
- $pdo = $this->getPDO();
- $backend = new PDO($pdo);
-
- $propPatch = new DAV\PropPatch([
- '{DAV:}displayname' => 'pietje',
- '{DAV:}unknown' => 'foo',
- ]);
-
- $backend->updatePrincipal('principals/user', $propPatch);
- $result = $propPatch->commit();
-
- $this->assertFalse($result);
-
- $this->assertEquals([
- '{DAV:}displayname' => 424,
- '{DAV:}unknown' => 403
- ], $propPatch->getResult());
-
- $this->assertEquals([
- 'id' => '4',
- 'uri' => 'principals/user',
- '{DAV:}displayname' => 'User',
- '{http://sabredav.org/ns}email-address' => 'user@example.org',
- ], $backend->getPrincipalByPath('principals/user'));
-
- }
-
- function testFindByUriUnknownScheme() {
-
- $pdo = $this->getPDO();
- $backend = new PDO($pdo);
- $this->assertNull($backend->findByUri('http://foo', 'principals'));
-
- }
-
-
- function testFindByUri() {
-
- $pdo = $this->getPDO();
- $backend = new PDO($pdo);
- $this->assertEquals(
- 'principals/user',
- $backend->findByUri('mailto:user@example.org', 'principals')
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/Mock.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/Mock.php
deleted file mode 100644
index 1464f4c26ab..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/Mock.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\PrincipalBackend;
-
-class Mock extends AbstractBackend {
-
- public $groupMembers = [];
- public $principals;
-
- function __construct(array $principals = null) {
-
- $this->principals = $principals;
-
- if (is_null($principals)) {
-
- $this->principals = [
- [
- 'uri' => 'principals/user1',
- '{DAV:}displayname' => 'User 1',
- '{http://sabredav.org/ns}email-address' => 'user1.sabredav@sabredav.org',
- '{http://sabredav.org/ns}vcard-url' => 'addressbooks/user1/book1/vcard1.vcf',
- ],
- [
- 'uri' => 'principals/admin',
- '{DAV:}displayname' => 'Admin',
- ],
- [
- 'uri' => 'principals/user2',
- '{DAV:}displayname' => 'User 2',
- '{http://sabredav.org/ns}email-address' => 'user2.sabredav@sabredav.org',
- ],
- ];
-
- }
-
- }
-
- function getPrincipalsByPrefix($prefix) {
-
- $prefix = trim($prefix, '/');
- if ($prefix) $prefix .= '/';
- $return = [];
-
- foreach ($this->principals as $principal) {
-
- if ($prefix && strpos($principal['uri'], $prefix) !== 0) continue;
-
- $return[] = $principal;
-
- }
-
- return $return;
-
- }
-
- function addPrincipal(array $principal) {
-
- $this->principals[] = $principal;
-
- }
-
- function getPrincipalByPath($path) {
-
- foreach ($this->getPrincipalsByPrefix('principals') as $principal) {
- if ($principal['uri'] === $path) return $principal;
- }
-
- }
-
- function searchPrincipals($prefixPath, array $searchProperties, $test = 'allof') {
-
- $matches = [];
- foreach ($this->getPrincipalsByPrefix($prefixPath) as $principal) {
-
- foreach ($searchProperties as $key => $value) {
-
- if (!isset($principal[$key])) {
- continue 2;
- }
- if (mb_stripos($principal[$key], $value, 0, 'UTF-8') === false) {
- continue 2;
- }
-
- // We have a match for this searchProperty!
- if ($test === 'allof') {
- continue;
- } else {
- break;
- }
-
- }
- $matches[] = $principal['uri'];
-
- }
- return $matches;
-
- }
-
- function getGroupMemberSet($path) {
-
- return isset($this->groupMembers[$path]) ? $this->groupMembers[$path] : [];
-
- }
-
- function getGroupMembership($path) {
-
- $membership = [];
- foreach ($this->groupMembers as $group => $members) {
- if (in_array($path, $members)) $membership[] = $group;
- }
- return $membership;
-
- }
-
- function setGroupMemberSet($path, array $members) {
-
- $this->groupMembers[$path] = $members;
-
- }
-
- /**
- * Updates one ore more webdav properties on a principal.
- *
- * The list of mutations is stored in a Sabre\DAV\PropPatch object.
- * To do the actual updates, you must tell this object which properties
- * you're going to process with the handle() method.
- *
- * Calling the handle method is like telling the PropPatch object "I
- * promise I can handle updating this property".
- *
- * Read the PropPatch documentation for more info and examples.
- *
- * @param string $path
- * @param \Sabre\DAV\PropPatch $propPatch
- */
- function updatePrincipal($path, \Sabre\DAV\PropPatch $propPatch) {
-
- $value = null;
- foreach ($this->principals as $principalIndex => $value) {
- if ($value['uri'] === $path) {
- $principal = $value;
- break;
- }
- }
- if (!$principal) return;
-
- $propPatch->handleRemaining(function($mutations) use ($principal, $principalIndex) {
-
- foreach ($mutations as $prop => $value) {
-
- if (is_null($value) && isset($principal[$prop])) {
- unset($principal[$prop]);
- } else {
- $principal[$prop] = $value;
- }
-
- }
-
- $this->principals[$principalIndex] = $principal;
-
- return true;
-
- });
-
- }
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/PDOMySQLTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/PDOMySQLTest.php
deleted file mode 100644
index 8779eb69f53..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/PDOMySQLTest.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\PrincipalBackend;
-
-class PDOMySQLTest extends AbstractPDOTest {
-
- public $driver = 'mysql';
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/PDOPgSqlTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/PDOPgSqlTest.php
deleted file mode 100644
index 302616e785c..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/PDOPgSqlTest.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\PrincipalBackend;
-
-class PDOPgSqlTest extends AbstractPDOTest {
-
- public $driver = 'pgsql';
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/PDOSqliteTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/PDOSqliteTest.php
deleted file mode 100644
index 48454981d54..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalBackend/PDOSqliteTest.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\PrincipalBackend;
-
-class PDOSqliteTest extends AbstractPDOTest {
-
- public $driver = 'sqlite';
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalCollectionTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalCollectionTest.php
deleted file mode 100644
index bcf78821bc9..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalCollectionTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-class PrincipalCollectionTest extends \PHPUnit_Framework_TestCase {
-
- function testBasic() {
-
- $backend = new PrincipalBackend\Mock();
- $pc = new PrincipalCollection($backend);
- $this->assertTrue($pc instanceof PrincipalCollection);
-
- $this->assertEquals('principals', $pc->getName());
-
- }
-
- /**
- * @depends testBasic
- */
- function testGetChildren() {
-
- $backend = new PrincipalBackend\Mock();
- $pc = new PrincipalCollection($backend);
-
- $children = $pc->getChildren();
- $this->assertTrue(is_array($children));
-
- foreach ($children as $child) {
- $this->assertTrue($child instanceof IPrincipal);
- }
-
- }
-
- /**
- * @depends testBasic
- * @expectedException Sabre\DAV\Exception\MethodNotAllowed
- */
- function testGetChildrenDisable() {
-
- $backend = new PrincipalBackend\Mock();
- $pc = new PrincipalCollection($backend);
- $pc->disableListing = true;
-
- $children = $pc->getChildren();
-
- }
-
- function testFindByUri() {
-
- $backend = new PrincipalBackend\Mock();
- $pc = new PrincipalCollection($backend);
- $this->assertEquals('principals/user1', $pc->findByUri('mailto:user1.sabredav@sabredav.org'));
- $this->assertNull($pc->findByUri('mailto:fake.user.sabredav@sabredav.org'));
- $this->assertNull($pc->findByUri(''));
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalMatchTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalMatchTest.php
deleted file mode 100644
index 427e37972db..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalMatchTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-use Sabre\HTTP\Request;
-
-class PrincipalMatchTest extends \Sabre\DAVServerTest {
-
- public $setupACL = true;
- public $autoLogin = 'user1';
-
- function testPrincipalMatch() {
-
- $xml = <<<XML
-<?xml version="1.0"?>
-<principal-match xmlns="DAV:">
- <self />
-</principal-match>
-XML;
-
- $request = new Request('REPORT', '/principals', ['Content-Type' => 'application/xml']);
- $request->setBody($xml);
-
- $response = $this->request($request, 207);
-
- $expected = <<<XML
-<?xml version="1.0"?>
-<d:multistatus xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
- <d:status>HTTP/1.1 200 OK</d:status>
- <d:href>/principals/user1</d:href>
- <d:propstat>
- <d:prop/>
- <d:status>HTTP/1.1 418 I'm a teapot</d:status>
- </d:propstat>
-</d:multistatus>
-XML;
-
- $this->assertXmlStringEqualsXmlString(
- $expected,
- $response->getBodyAsString()
- );
-
- }
-
- function testPrincipalMatchProp() {
-
- $xml = <<<XML
-<?xml version="1.0"?>
-<principal-match xmlns="DAV:">
- <self />
- <prop>
- <resourcetype />
- </prop>
-</principal-match>
-XML;
-
- $request = new Request('REPORT', '/principals', ['Content-Type' => 'application/xml']);
- $request->setBody($xml);
-
- $response = $this->request($request, 207);
-
- $expected = <<<XML
-<?xml version="1.0"?>
-<d:multistatus xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
- <d:status>HTTP/1.1 200 OK</d:status>
- <d:href>/principals/user1/</d:href>
- <d:propstat>
- <d:prop>
- <d:resourcetype><d:principal/></d:resourcetype>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
-</d:multistatus>
-XML;
-
- $this->assertXmlStringEqualsXmlString(
- $expected,
- $response->getBodyAsString()
- );
-
- }
-
- function testPrincipalMatchPrincipalProperty() {
-
- $xml = <<<XML
-<?xml version="1.0"?>
-<principal-match xmlns="DAV:">
- <principal-property>
- <principal-URL />
- </principal-property>
- <prop>
- <resourcetype />
- </prop>
-</principal-match>
-XML;
-
- $request = new Request('REPORT', '/principals', ['Content-Type' => 'application/xml']);
- $request->setBody($xml);
-
- $response = $this->request($request, 207);
-
- $expected = <<<XML
-<?xml version="1.0"?>
-<d:multistatus xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
- <d:status>HTTP/1.1 200 OK</d:status>
- <d:href>/principals/user1/</d:href>
- <d:propstat>
- <d:prop>
- <d:resourcetype><d:principal/></d:resourcetype>
- </d:prop>
- <d:status>HTTP/1.1 200 OK</d:status>
- </d:propstat>
-</d:multistatus>
-XML;
-
- $this->assertXmlStringEqualsXmlString(
- $expected,
- $response->getBodyAsString()
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php
deleted file mode 100644
index 60e156d9a0a..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalPropertySearchTest.php
+++ /dev/null
@@ -1,397 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-use Sabre\DAV;
-use Sabre\HTTP;
-
-require_once 'Sabre/HTTP/ResponseMock.php';
-
-class PrincipalPropertySearchTest extends \PHPUnit_Framework_TestCase {
-
- function getServer() {
-
- $backend = new PrincipalBackend\Mock();
-
- $dir = new DAV\SimpleCollection('root');
- $principals = new PrincipalCollection($backend);
- $dir->addChild($principals);
-
- $fakeServer = new DAV\Server($dir);
- $fakeServer->sapi = new HTTP\SapiMock();
- $fakeServer->httpResponse = new HTTP\ResponseMock();
- $fakeServer->debugExceptions = true;
- $plugin = new MockPlugin();
- $plugin->allowAccessToNodesWithoutACL = true;
- $plugin->allowUnauthenticatedAccess = false;
-
- $this->assertTrue($plugin instanceof Plugin);
- $fakeServer->addPlugin($plugin);
- $this->assertEquals($plugin, $fakeServer->getPlugin('acl'));
-
- return $fakeServer;
-
- }
-
- function testDepth1() {
-
- $xml = '<?xml version="1.0"?>
-<d:principal-property-search xmlns:d="DAV:">
- <d:property-search>
- <d:prop>
- <d:displayname />
- </d:prop>
- <d:match>user</d:match>
- </d:property-search>
- <d:prop>
- <d:displayname />
- <d:getcontentlength />
- </d:prop>
-</d:principal-property-search>';
-
- $serverVars = [
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_DEPTH' => '1',
- 'REQUEST_URI' => '/principals',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody($xml);
-
- $server = $this->getServer();
- $server->httpRequest = $request;
-
- $server->exec();
-
- $this->assertEquals(400, $server->httpResponse->getStatus(), $server->httpResponse->getBodyAsString());
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $server->httpResponse->getHeaders());
-
- }
-
-
- function testUnknownSearchField() {
-
- $xml = '<?xml version="1.0"?>
-<d:principal-property-search xmlns:d="DAV:">
- <d:property-search>
- <d:prop>
- <d:yourmom />
- </d:prop>
- <d:match>user</d:match>
- </d:property-search>
- <d:prop>
- <d:displayname />
- <d:getcontentlength />
- </d:prop>
-</d:principal-property-search>';
-
- $serverVars = [
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_DEPTH' => '0',
- 'REQUEST_URI' => '/principals',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody($xml);
-
- $server = $this->getServer();
- $server->httpRequest = $request;
-
- $server->exec();
-
- $this->assertEquals(207, $server->httpResponse->getStatus(), "Full body: " . $server->httpResponse->getBodyAsString());
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- 'Vary' => ['Brief,Prefer'],
- ], $server->httpResponse->getHeaders());
-
- }
-
- function testCorrect() {
-
- $xml = '<?xml version="1.0"?>
-<d:principal-property-search xmlns:d="DAV:">
- <d:apply-to-principal-collection-set />
- <d:property-search>
- <d:prop>
- <d:displayname />
- </d:prop>
- <d:match>user</d:match>
- </d:property-search>
- <d:prop>
- <d:displayname />
- <d:getcontentlength />
- </d:prop>
-</d:principal-property-search>';
-
- $serverVars = [
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_DEPTH' => '0',
- 'REQUEST_URI' => '/',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody($xml);
-
- $server = $this->getServer();
- $server->httpRequest = $request;
-
- $server->exec();
-
- $this->assertEquals(207, $server->httpResponse->status, $server->httpResponse->body);
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- 'Vary' => ['Brief,Prefer'],
- ], $server->httpResponse->getHeaders());
-
-
- $check = [
- '/d:multistatus',
- '/d:multistatus/d:response' => 2,
- '/d:multistatus/d:response/d:href' => 2,
- '/d:multistatus/d:response/d:propstat' => 4,
- '/d:multistatus/d:response/d:propstat/d:prop' => 4,
- '/d:multistatus/d:response/d:propstat/d:prop/d:displayname' => 2,
- '/d:multistatus/d:response/d:propstat/d:prop/d:getcontentlength' => 2,
- '/d:multistatus/d:response/d:propstat/d:status' => 4,
- ];
-
- $xml = simplexml_load_string($server->httpResponse->body);
- $xml->registerXPathNamespace('d', 'DAV:');
- foreach ($check as $v1 => $v2) {
-
- $xpath = is_int($v1) ? $v2 : $v1;
-
- $result = $xml->xpath($xpath);
-
- $count = 1;
- if (!is_int($v1)) $count = $v2;
-
- $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . '. Full response body: ' . $server->httpResponse->body);
-
- }
-
- }
-
- function testAND() {
-
- $xml = '<?xml version="1.0"?>
-<d:principal-property-search xmlns:d="DAV:">
- <d:apply-to-principal-collection-set />
- <d:property-search>
- <d:prop>
- <d:displayname />
- </d:prop>
- <d:match>user</d:match>
- </d:property-search>
- <d:property-search>
- <d:prop>
- <d:foo />
- </d:prop>
- <d:match>bar</d:match>
- </d:property-search>
- <d:prop>
- <d:displayname />
- <d:getcontentlength />
- </d:prop>
-</d:principal-property-search>';
-
- $serverVars = [
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_DEPTH' => '0',
- 'REQUEST_URI' => '/',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody($xml);
-
- $server = $this->getServer();
- $server->httpRequest = $request;
-
- $server->exec();
-
- $this->assertEquals(207, $server->httpResponse->status, $server->httpResponse->body);
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- 'Vary' => ['Brief,Prefer'],
- ], $server->httpResponse->getHeaders());
-
-
- $check = [
- '/d:multistatus',
- '/d:multistatus/d:response' => 0,
- '/d:multistatus/d:response/d:href' => 0,
- '/d:multistatus/d:response/d:propstat' => 0,
- '/d:multistatus/d:response/d:propstat/d:prop' => 0,
- '/d:multistatus/d:response/d:propstat/d:prop/d:displayname' => 0,
- '/d:multistatus/d:response/d:propstat/d:prop/d:getcontentlength' => 0,
- '/d:multistatus/d:response/d:propstat/d:status' => 0,
- ];
-
- $xml = simplexml_load_string($server->httpResponse->body);
- $xml->registerXPathNamespace('d', 'DAV:');
- foreach ($check as $v1 => $v2) {
-
- $xpath = is_int($v1) ? $v2 : $v1;
-
- $result = $xml->xpath($xpath);
-
- $count = 1;
- if (!is_int($v1)) $count = $v2;
-
- $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . '. Full response body: ' . $server->httpResponse->body);
-
- }
-
- }
- function testOR() {
-
- $xml = '<?xml version="1.0"?>
-<d:principal-property-search xmlns:d="DAV:" test="anyof">
- <d:apply-to-principal-collection-set />
- <d:property-search>
- <d:prop>
- <d:displayname />
- </d:prop>
- <d:match>user</d:match>
- </d:property-search>
- <d:property-search>
- <d:prop>
- <d:foo />
- </d:prop>
- <d:match>bar</d:match>
- </d:property-search>
- <d:prop>
- <d:displayname />
- <d:getcontentlength />
- </d:prop>
-</d:principal-property-search>';
-
- $serverVars = [
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_DEPTH' => '0',
- 'REQUEST_URI' => '/',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody($xml);
-
- $server = $this->getServer();
- $server->httpRequest = $request;
-
- $server->exec();
-
- $this->assertEquals(207, $server->httpResponse->status, $server->httpResponse->body);
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- 'Vary' => ['Brief,Prefer'],
- ], $server->httpResponse->getHeaders());
-
-
- $check = [
- '/d:multistatus',
- '/d:multistatus/d:response' => 2,
- '/d:multistatus/d:response/d:href' => 2,
- '/d:multistatus/d:response/d:propstat' => 4,
- '/d:multistatus/d:response/d:propstat/d:prop' => 4,
- '/d:multistatus/d:response/d:propstat/d:prop/d:displayname' => 2,
- '/d:multistatus/d:response/d:propstat/d:prop/d:getcontentlength' => 2,
- '/d:multistatus/d:response/d:propstat/d:status' => 4,
- ];
-
- $xml = simplexml_load_string($server->httpResponse->body);
- $xml->registerXPathNamespace('d', 'DAV:');
- foreach ($check as $v1 => $v2) {
-
- $xpath = is_int($v1) ? $v2 : $v1;
-
- $result = $xml->xpath($xpath);
-
- $count = 1;
- if (!is_int($v1)) $count = $v2;
-
- $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . '. Full response body: ' . $server->httpResponse->body);
-
- }
-
- }
- function testWrongUri() {
-
- $xml = '<?xml version="1.0"?>
-<d:principal-property-search xmlns:d="DAV:">
- <d:property-search>
- <d:prop>
- <d:displayname />
- </d:prop>
- <d:match>user</d:match>
- </d:property-search>
- <d:prop>
- <d:displayname />
- <d:getcontentlength />
- </d:prop>
-</d:principal-property-search>';
-
- $serverVars = [
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_DEPTH' => '0',
- 'REQUEST_URI' => '/',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody($xml);
-
- $server = $this->getServer();
- $server->httpRequest = $request;
-
- $server->exec();
-
- $this->assertEquals(207, $server->httpResponse->status, $server->httpResponse->body);
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- 'Vary' => ['Brief,Prefer'],
- ], $server->httpResponse->getHeaders());
-
-
- $check = [
- '/d:multistatus',
- '/d:multistatus/d:response' => 0,
- ];
-
- $xml = simplexml_load_string($server->httpResponse->body);
- $xml->registerXPathNamespace('d', 'DAV:');
- foreach ($check as $v1 => $v2) {
-
- $xpath = is_int($v1) ? $v2 : $v1;
-
- $result = $xml->xpath($xpath);
-
- $count = 1;
- if (!is_int($v1)) $count = $v2;
-
- $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . '. Full response body: ' . $server->httpResponse->body);
-
- }
-
- }
-}
-
-class MockPlugin extends Plugin {
-
- function getCurrentUserPrivilegeSet($node) {
-
- return [
- '{DAV:}read',
- '{DAV:}write',
- ];
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php
deleted file mode 100644
index fa1314d108c..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalSearchPropertySetTest.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-use Sabre\DAV;
-use Sabre\HTTP;
-
-require_once 'Sabre/HTTP/ResponseMock.php';
-
-class PrincipalSearchPropertySetTest extends \PHPUnit_Framework_TestCase {
-
- function getServer() {
-
- $backend = new PrincipalBackend\Mock();
-
- $dir = new DAV\SimpleCollection('root');
- $principals = new PrincipalCollection($backend);
- $dir->addChild($principals);
-
- $fakeServer = new DAV\Server($dir);
- $fakeServer->sapi = new HTTP\SapiMock();
- $fakeServer->httpResponse = new HTTP\ResponseMock();
- $plugin = new Plugin();
- $plugin->allowUnauthenticatedAccess = false;
- $this->assertTrue($plugin instanceof Plugin);
- $fakeServer->addPlugin($plugin);
- $this->assertEquals($plugin, $fakeServer->getPlugin('acl'));
-
- return $fakeServer;
-
- }
-
- function testDepth1() {
-
- $xml = '<?xml version="1.0"?>
-<d:principal-search-property-set xmlns:d="DAV:" />';
-
- $serverVars = [
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_DEPTH' => '1',
- 'REQUEST_URI' => '/principals',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody($xml);
-
- $server = $this->getServer();
- $server->httpRequest = $request;
-
- $server->exec();
-
- $this->assertEquals(400, $server->httpResponse->status);
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $server->httpResponse->getHeaders());
-
- }
-
- function testDepthIncorrectXML() {
-
- $xml = '<?xml version="1.0"?>
-<d:principal-search-property-set xmlns:d="DAV:"><d:ohell /></d:principal-search-property-set>';
-
- $serverVars = [
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_DEPTH' => '0',
- 'REQUEST_URI' => '/principals',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody($xml);
-
- $server = $this->getServer();
- $server->httpRequest = $request;
-
- $server->exec();
-
- $this->assertEquals(400, $server->httpResponse->status, $server->httpResponse->body);
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $server->httpResponse->getHeaders());
-
- }
-
- function testCorrect() {
-
- $xml = '<?xml version="1.0"?>
-<d:principal-search-property-set xmlns:d="DAV:"/>';
-
- $serverVars = [
- 'REQUEST_METHOD' => 'REPORT',
- 'HTTP_DEPTH' => '0',
- 'REQUEST_URI' => '/principals',
- ];
-
- $request = HTTP\Sapi::createFromServerArray($serverVars);
- $request->setBody($xml);
-
- $server = $this->getServer();
- $server->httpRequest = $request;
-
- $server->exec();
-
- $this->assertEquals(200, $server->httpResponse->status, $server->httpResponse->body);
- $this->assertEquals([
- 'X-Sabre-Version' => [DAV\Version::VERSION],
- 'Content-Type' => ['application/xml; charset=utf-8'],
- ], $server->httpResponse->getHeaders());
-
-
- $check = [
- '/d:principal-search-property-set',
- '/d:principal-search-property-set/d:principal-search-property' => 2,
- '/d:principal-search-property-set/d:principal-search-property/d:prop' => 2,
- '/d:principal-search-property-set/d:principal-search-property/d:prop/d:displayname' => 1,
- '/d:principal-search-property-set/d:principal-search-property/d:prop/s:email-address' => 1,
- '/d:principal-search-property-set/d:principal-search-property/d:description' => 2,
- ];
-
- $xml = simplexml_load_string($server->httpResponse->body);
- $xml->registerXPathNamespace('d', 'DAV:');
- $xml->registerXPathNamespace('s', 'http://sabredav.org/ns');
- foreach ($check as $v1 => $v2) {
-
- $xpath = is_int($v1) ? $v2 : $v1;
-
- $result = $xml->xpath($xpath);
-
- $count = 1;
- if (!is_int($v1)) $count = $v2;
-
- $this->assertEquals($count, count($result), 'we expected ' . $count . ' appearances of ' . $xpath . ' . We found ' . count($result) . '. Full response body: ' . $server->httpResponse->body);
-
- }
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalTest.php
deleted file mode 100644
index 20622ad1757..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/PrincipalTest.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-use Sabre\DAV;
-use Sabre\HTTP;
-
-class PrincipalTest extends \PHPUnit_Framework_TestCase {
-
- function testConstruct() {
-
- $principalBackend = new PrincipalBackend\Mock();
- $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
- $this->assertTrue($principal instanceof Principal);
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception
- */
- function testConstructNoUri() {
-
- $principalBackend = new PrincipalBackend\Mock();
- $principal = new Principal($principalBackend, []);
-
- }
-
- function testGetName() {
-
- $principalBackend = new PrincipalBackend\Mock();
- $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
- $this->assertEquals('admin', $principal->getName());
-
- }
-
- function testGetDisplayName() {
-
- $principalBackend = new PrincipalBackend\Mock();
- $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
- $this->assertEquals('admin', $principal->getDisplayname());
-
- $principal = new Principal($principalBackend, [
- 'uri' => 'principals/admin',
- '{DAV:}displayname' => 'Mr. Admin'
- ]);
- $this->assertEquals('Mr. Admin', $principal->getDisplayname());
-
- }
-
- function testGetProperties() {
-
- $principalBackend = new PrincipalBackend\Mock();
- $principal = new Principal($principalBackend, [
- 'uri' => 'principals/admin',
- '{DAV:}displayname' => 'Mr. Admin',
- '{http://www.example.org/custom}custom' => 'Custom',
- '{http://sabredav.org/ns}email-address' => 'admin@example.org',
- ]);
-
- $keys = [
- '{DAV:}displayname',
- '{http://www.example.org/custom}custom',
- '{http://sabredav.org/ns}email-address',
- ];
- $props = $principal->getProperties($keys);
-
- foreach ($keys as $key) $this->assertArrayHasKey($key, $props);
-
- $this->assertEquals('Mr. Admin', $props['{DAV:}displayname']);
-
- $this->assertEquals('admin@example.org', $props['{http://sabredav.org/ns}email-address']);
- }
-
- function testUpdateProperties() {
-
- $principalBackend = new PrincipalBackend\Mock();
- $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
-
- $propPatch = new DAV\PropPatch(['{DAV:}yourmom' => 'test']);
-
- $result = $principal->propPatch($propPatch);
- $result = $propPatch->commit();
- $this->assertTrue($result);
-
- }
-
- function testGetPrincipalUrl() {
-
- $principalBackend = new PrincipalBackend\Mock();
- $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
- $this->assertEquals('principals/admin', $principal->getPrincipalUrl());
-
- }
-
- function testGetAlternateUriSet() {
-
- $principalBackend = new PrincipalBackend\Mock();
- $principal = new Principal($principalBackend, [
- 'uri' => 'principals/admin',
- '{DAV:}displayname' => 'Mr. Admin',
- '{http://www.example.org/custom}custom' => 'Custom',
- '{http://sabredav.org/ns}email-address' => 'admin@example.org',
- '{DAV:}alternate-URI-set' => [
- 'mailto:admin+1@example.org',
- 'mailto:admin+2@example.org',
- 'mailto:admin@example.org',
- ],
- ]);
-
- $expected = [
- 'mailto:admin+1@example.org',
- 'mailto:admin+2@example.org',
- 'mailto:admin@example.org',
- ];
-
- $this->assertEquals($expected, $principal->getAlternateUriSet());
-
- }
- function testGetAlternateUriSetEmpty() {
-
- $principalBackend = new PrincipalBackend\Mock();
- $principal = new Principal($principalBackend, [
- 'uri' => 'principals/admin',
- ]);
-
- $expected = [];
-
- $this->assertEquals($expected, $principal->getAlternateUriSet());
-
- }
-
- function testGetGroupMemberSet() {
-
- $principalBackend = new PrincipalBackend\Mock();
- $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
- $this->assertEquals([], $principal->getGroupMemberSet());
-
- }
- function testGetGroupMembership() {
-
- $principalBackend = new PrincipalBackend\Mock();
- $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
- $this->assertEquals([], $principal->getGroupMembership());
-
- }
-
- function testSetGroupMemberSet() {
-
- $principalBackend = new PrincipalBackend\Mock();
- $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
- $principal->setGroupMemberSet(['principals/foo']);
-
- $this->assertEquals([
- 'principals/admin' => ['principals/foo'],
- ], $principalBackend->groupMembers);
-
- }
-
- function testGetOwner() {
-
- $principalBackend = new PrincipalBackend\Mock();
- $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
- $this->assertEquals('principals/admin', $principal->getOwner());
-
- }
-
- function testGetGroup() {
-
- $principalBackend = new PrincipalBackend\Mock();
- $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
- $this->assertNull($principal->getGroup());
-
- }
-
- function testGetACl() {
-
- $principalBackend = new PrincipalBackend\Mock();
- $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
- $this->assertEquals([
- [
- 'privilege' => '{DAV:}all',
- 'principal' => '{DAV:}owner',
- 'protected' => true,
- ]
- ], $principal->getACL());
-
- }
-
- /**
- * @expectedException \Sabre\DAV\Exception\Forbidden
- */
- function testSetACl() {
-
- $principalBackend = new PrincipalBackend\Mock();
- $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
- $principal->setACL([]);
-
- }
-
- function testGetSupportedPrivilegeSet() {
-
- $principalBackend = new PrincipalBackend\Mock();
- $principal = new Principal($principalBackend, ['uri' => 'principals/admin']);
- $this->assertNull($principal->getSupportedPrivilegeSet());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/SimplePluginTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/SimplePluginTest.php
deleted file mode 100644
index 2de0ba6a853..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/SimplePluginTest.php
+++ /dev/null
@@ -1,321 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL;
-
-use Sabre\DAV;
-use Sabre\HTTP;
-
-require_once 'Sabre/DAVACL/MockPrincipal.php';
-require_once 'Sabre/DAVACL/MockACLNode.php';
-
-class SimplePluginTest extends \PHPUnit_Framework_TestCase {
-
- function testValues() {
-
- $aclPlugin = new Plugin();
- $this->assertEquals('acl', $aclPlugin->getPluginName());
- $this->assertEquals(
- ['access-control', 'calendarserver-principal-property-search'],
- $aclPlugin->getFeatures()
- );
-
- $this->assertEquals(
- [
- '{DAV:}expand-property',
- '{DAV:}principal-match',
- '{DAV:}principal-property-search',
- '{DAV:}principal-search-property-set'
- ],
- $aclPlugin->getSupportedReportSet(''));
-
- $this->assertEquals(['ACL'], $aclPlugin->getMethods(''));
-
-
- $this->assertEquals(
- 'acl',
- $aclPlugin->getPluginInfo()['name']
- );
- }
-
- function testGetFlatPrivilegeSet() {
-
- $expected = [
- '{DAV:}all' => [
- 'privilege' => '{DAV:}all',
- 'abstract' => false,
- 'aggregates' => [
- '{DAV:}read',
- '{DAV:}write',
- ],
- 'concrete' => '{DAV:}all',
- ],
- '{DAV:}read' => [
- 'privilege' => '{DAV:}read',
- 'abstract' => false,
- 'aggregates' => [
- '{DAV:}read-acl',
- '{DAV:}read-current-user-privilege-set',
- ],
- 'concrete' => '{DAV:}read',
- ],
- '{DAV:}read-acl' => [
- 'privilege' => '{DAV:}read-acl',
- 'abstract' => false,
- 'aggregates' => [],
- 'concrete' => '{DAV:}read-acl',
- ],
- '{DAV:}read-current-user-privilege-set' => [
- 'privilege' => '{DAV:}read-current-user-privilege-set',
- 'abstract' => false,
- 'aggregates' => [],
- 'concrete' => '{DAV:}read-current-user-privilege-set',
- ],
- '{DAV:}write' => [
- 'privilege' => '{DAV:}write',
- 'abstract' => false,
- 'aggregates' => [
- '{DAV:}write-properties',
- '{DAV:}write-content',
- '{DAV:}unlock',
- '{DAV:}bind',
- '{DAV:}unbind',
- ],
- 'concrete' => '{DAV:}write',
- ],
- '{DAV:}write-properties' => [
- 'privilege' => '{DAV:}write-properties',
- 'abstract' => false,
- 'aggregates' => [],
- 'concrete' => '{DAV:}write-properties',
- ],
- '{DAV:}write-content' => [
- 'privilege' => '{DAV:}write-content',
- 'abstract' => false,
- 'aggregates' => [],
- 'concrete' => '{DAV:}write-content',
- ],
- '{DAV:}unlock' => [
- 'privilege' => '{DAV:}unlock',
- 'abstract' => false,
- 'aggregates' => [],
- 'concrete' => '{DAV:}unlock',
- ],
- '{DAV:}bind' => [
- 'privilege' => '{DAV:}bind',
- 'abstract' => false,
- 'aggregates' => [],
- 'concrete' => '{DAV:}bind',
- ],
- '{DAV:}unbind' => [
- 'privilege' => '{DAV:}unbind',
- 'abstract' => false,
- 'aggregates' => [],
- 'concrete' => '{DAV:}unbind',
- ],
-
- ];
-
- $plugin = new Plugin();
- $plugin->allowUnauthenticatedAccess = false;
- $server = new DAV\Server();
- $server->addPlugin($plugin);
- $this->assertEquals($expected, $plugin->getFlatPrivilegeSet(''));
-
- }
-
- function testCurrentUserPrincipalsNotLoggedIn() {
-
- $acl = new Plugin();
- $acl->allowUnauthenticatedAccess = false;
- $server = new DAV\Server();
- $server->addPlugin($acl);
-
- $this->assertEquals([], $acl->getCurrentUserPrincipals());
-
- }
-
- function testCurrentUserPrincipalsSimple() {
-
- $tree = [
-
- new DAV\SimpleCollection('principals', [
- new MockPrincipal('admin', 'principals/admin'),
- ])
-
- ];
-
- $acl = new Plugin();
- $acl->allowUnauthenticatedAccess = false;
- $server = new DAV\Server($tree);
- $server->addPlugin($acl);
-
- $auth = new DAV\Auth\Plugin(new DAV\Auth\Backend\Mock());
- $server->addPlugin($auth);
-
- //forcing login
- $auth->beforeMethod(new HTTP\Request(), new HTTP\Response());
-
- $this->assertEquals(['principals/admin'], $acl->getCurrentUserPrincipals());
-
- }
-
- function testCurrentUserPrincipalsGroups() {
-
- $tree = [
-
- new DAV\SimpleCollection('principals', [
- new MockPrincipal('admin', 'principals/admin', ['principals/administrators', 'principals/everyone']),
- new MockPrincipal('administrators', 'principals/administrators', ['principals/groups'], ['principals/admin']),
- new MockPrincipal('everyone', 'principals/everyone', [], ['principals/admin']),
- new MockPrincipal('groups', 'principals/groups', [], ['principals/administrators']),
- ])
-
- ];
-
- $acl = new Plugin();
- $acl->allowUnauthenticatedAccess = false;
- $server = new DAV\Server($tree);
- $server->addPlugin($acl);
-
- $auth = new DAV\Auth\Plugin(new DAV\Auth\Backend\Mock());
- $server->addPlugin($auth);
-
- //forcing login
- $auth->beforeMethod(new HTTP\Request(), new HTTP\Response());
-
- $expected = [
- 'principals/admin',
- 'principals/administrators',
- 'principals/everyone',
- 'principals/groups',
- ];
-
- $this->assertEquals($expected, $acl->getCurrentUserPrincipals());
-
- // The second one should trigger the cache and be identical
- $this->assertEquals($expected, $acl->getCurrentUserPrincipals());
-
- }
-
- function testGetACL() {
-
- $acl = [
- [
- 'principal' => 'principals/admin',
- 'privilege' => '{DAV:}read',
- ],
- [
- 'principal' => 'principals/admin',
- 'privilege' => '{DAV:}write',
- ],
- ];
-
-
- $tree = [
- new MockACLNode('foo', $acl),
- ];
-
- $server = new DAV\Server($tree);
- $aclPlugin = new Plugin();
- $aclPlugin->allowUnauthenticatedAccess = false;
- $server->addPlugin($aclPlugin);
-
- $this->assertEquals($acl, $aclPlugin->getACL('foo'));
-
- }
-
- function testGetCurrentUserPrivilegeSet() {
-
- $acl = [
- [
- 'principal' => 'principals/admin',
- 'privilege' => '{DAV:}read',
- ],
- [
- 'principal' => 'principals/user1',
- 'privilege' => '{DAV:}read',
- ],
- [
- 'principal' => 'principals/admin',
- 'privilege' => '{DAV:}write',
- ],
- ];
-
-
- $tree = [
- new MockACLNode('foo', $acl),
-
- new DAV\SimpleCollection('principals', [
- new MockPrincipal('admin', 'principals/admin'),
- ]),
-
- ];
-
- $server = new DAV\Server($tree);
- $aclPlugin = new Plugin();
- $aclPlugin->allowUnauthenticatedAccess = false;
- $server->addPlugin($aclPlugin);
-
- $auth = new DAV\Auth\Plugin(new DAV\Auth\Backend\Mock());
- $server->addPlugin($auth);
-
- //forcing login
- $auth->beforeMethod(new HTTP\Request(), new HTTP\Response());
-
- $expected = [
- '{DAV:}write',
- '{DAV:}write-properties',
- '{DAV:}write-content',
- '{DAV:}unlock',
- '{DAV:}write-acl',
- '{DAV:}read',
- '{DAV:}read-acl',
- '{DAV:}read-current-user-privilege-set',
- ];
-
- $this->assertEquals($expected, $aclPlugin->getCurrentUserPrivilegeSet('foo'));
-
- }
-
- function testCheckPrivileges() {
-
- $acl = [
- [
- 'principal' => 'principals/admin',
- 'privilege' => '{DAV:}read',
- ],
- [
- 'principal' => 'principals/user1',
- 'privilege' => '{DAV:}read',
- ],
- [
- 'principal' => 'principals/admin',
- 'privilege' => '{DAV:}write',
- ],
- ];
-
-
- $tree = [
- new MockACLNode('foo', $acl),
-
- new DAV\SimpleCollection('principals', [
- new MockPrincipal('admin', 'principals/admin'),
- ]),
-
- ];
-
- $server = new DAV\Server($tree);
- $aclPlugin = new Plugin();
- $aclPlugin->allowUnauthenticatedAccess = false;
- $server->addPlugin($aclPlugin);
-
- $auth = new DAV\Auth\Plugin(new DAV\Auth\Backend\Mock());
- $server->addPlugin($auth);
-
- //forcing login
- //$auth->beforeMethod('GET','/');
-
- $this->assertFalse($aclPlugin->checkPrivileges('foo', ['{DAV:}read'], Plugin::R_PARENT, false));
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Property/ACLTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Property/ACLTest.php
deleted file mode 100644
index 7b9853fe5fe..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Property/ACLTest.php
+++ /dev/null
@@ -1,342 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Xml\Property;
-
-use Sabre\DAV;
-use Sabre\DAV\Browser\HtmlOutputHelper;
-use Sabre\HTTP;
-
-class ACLTest extends \PHPUnit_Framework_TestCase {
-
- function testConstruct() {
-
- $acl = new Acl([]);
- $this->assertInstanceOf('Sabre\DAVACL\Xml\Property\ACL', $acl);
-
- }
-
- function testSerializeEmpty() {
-
- $acl = new Acl([]);
- $xml = (new DAV\Server())->xml->write('{DAV:}root', $acl);
-
- $expected = '<?xml version="1.0"?>
-<d:root xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns" />';
-
- $this->assertXmlStringEqualsXmlString($expected, $xml);
-
- }
-
- function testSerialize() {
-
- $privileges = [
- [
- 'principal' => 'principals/evert',
- 'privilege' => '{DAV:}write',
- ],
- [
- 'principal' => 'principals/foo',
- 'privilege' => '{DAV:}read',
- 'protected' => true,
- ],
- ];
-
- $acl = new Acl($privileges);
- $xml = (new DAV\Server())->xml->write('{DAV:}root', $acl, '/');
-
- $expected = '<?xml version="1.0"?>
-<d:root xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
- <d:ace>
- <d:principal>
- <d:href>/principals/evert/</d:href>
- </d:principal>
- <d:grant>
- <d:privilege>
- <d:write/>
- </d:privilege>
- </d:grant>
- </d:ace>
- <d:ace>
- <d:principal>
- <d:href>/principals/foo/</d:href>
- </d:principal>
- <d:grant>
- <d:privilege>
- <d:read/>
- </d:privilege>
- </d:grant>
- <d:protected/>
- </d:ace>
-</d:root>
-';
- $this->assertXmlStringEqualsXmlString($expected, $xml);
-
- }
-
- function testSerializeSpecialPrincipals() {
-
- $privileges = [
- [
- 'principal' => '{DAV:}authenticated',
- 'privilege' => '{DAV:}write',
- ],
- [
- 'principal' => '{DAV:}unauthenticated',
- 'privilege' => '{DAV:}write',
- ],
- [
- 'principal' => '{DAV:}all',
- 'privilege' => '{DAV:}write',
- ],
-
- ];
-
- $acl = new Acl($privileges);
- $xml = (new DAV\Server())->xml->write('{DAV:}root', $acl, '/');
-
- $expected = '<?xml version="1.0"?>
-<d:root xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
- <d:ace>
- <d:principal>
- <d:authenticated/>
- </d:principal>
- <d:grant>
- <d:privilege>
- <d:write/>
- </d:privilege>
- </d:grant>
- </d:ace>
- <d:ace>
- <d:principal>
- <d:unauthenticated/>
- </d:principal>
- <d:grant>
- <d:privilege>
- <d:write/>
- </d:privilege>
- </d:grant>
- </d:ace>
- <d:ace>
- <d:principal>
- <d:all/>
- </d:principal>
- <d:grant>
- <d:privilege>
- <d:write/>
- </d:privilege>
- </d:grant>
- </d:ace>
-</d:root>
-';
- $this->assertXmlStringEqualsXmlString($expected, $xml);
-
- }
-
- function testUnserialize() {
-
- $source = '<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:ace>
- <d:principal>
- <d:href>/principals/evert/</d:href>
- </d:principal>
- <d:grant>
- <d:privilege>
- <d:write/>
- </d:privilege>
- </d:grant>
- </d:ace>
- <d:ace>
- <d:principal>
- <d:href>/principals/foo/</d:href>
- </d:principal>
- <d:grant>
- <d:privilege>
- <d:read/>
- </d:privilege>
- </d:grant>
- <d:protected/>
- </d:ace>
-</d:root>
-';
-
- $reader = new \Sabre\Xml\Reader();
- $reader->elementMap['{DAV:}root'] = 'Sabre\DAVACL\Xml\Property\Acl';
- $reader->xml($source);
-
- $result = $reader->parse();
- $result = $result['value'];
-
- $this->assertInstanceOf('Sabre\\DAVACL\\Xml\\Property\\Acl', $result);
-
- $expected = [
- [
- 'principal' => '/principals/evert/',
- 'protected' => false,
- 'privilege' => '{DAV:}write',
- ],
- [
- 'principal' => '/principals/foo/',
- 'protected' => true,
- 'privilege' => '{DAV:}read',
- ],
- ];
-
- $this->assertEquals($expected, $result->getPrivileges());
-
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\BadRequest
- */
- function testUnserializeNoPrincipal() {
-
- $source = '<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:ace>
- <d:grant>
- <d:privilege>
- <d:write/>
- </d:privilege>
- </d:grant>
- </d:ace>
-</d:root>
-';
-
-
- $reader = new \Sabre\Xml\Reader();
- $reader->elementMap['{DAV:}root'] = 'Sabre\DAVACL\Xml\Property\Acl';
- $reader->xml($source);
-
- $result = $reader->parse();
-
- }
-
- function testUnserializeOtherPrincipal() {
-
- $source = '<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:ace>
- <d:grant>
- <d:privilege>
- <d:write/>
- </d:privilege>
- </d:grant>
- <d:principal><d:authenticated /></d:principal>
- </d:ace>
- <d:ace>
- <d:grant>
- <d:ignoreme />
- <d:privilege>
- <d:write/>
- </d:privilege>
- </d:grant>
- <d:principal><d:unauthenticated /></d:principal>
- </d:ace>
- <d:ace>
- <d:grant>
- <d:privilege>
- <d:write/>
- </d:privilege>
- </d:grant>
- <d:principal><d:all /></d:principal>
- </d:ace>
-</d:root>
-';
-
- $reader = new \Sabre\Xml\Reader();
- $reader->elementMap['{DAV:}root'] = 'Sabre\DAVACL\Xml\Property\Acl';
- $reader->xml($source);
-
- $result = $reader->parse();
- $result = $result['value'];
-
- $this->assertInstanceOf('Sabre\\DAVACL\\Xml\\Property\\Acl', $result);
-
- $expected = [
- [
- 'principal' => '{DAV:}authenticated',
- 'protected' => false,
- 'privilege' => '{DAV:}write',
- ],
- [
- 'principal' => '{DAV:}unauthenticated',
- 'protected' => false,
- 'privilege' => '{DAV:}write',
- ],
- [
- 'principal' => '{DAV:}all',
- 'protected' => false,
- 'privilege' => '{DAV:}write',
- ],
- ];
-
- $this->assertEquals($expected, $result->getPrivileges());
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\NotImplemented
- */
- function testUnserializeDeny() {
-
- $source = '<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:ignore-me />
- <d:ace>
- <d:deny>
- <d:privilege>
- <d:write/>
- </d:privilege>
- </d:deny>
- <d:principal><d:href>/principals/evert</d:href></d:principal>
- </d:ace>
-</d:root>
-';
-
- $reader = new \Sabre\Xml\Reader();
- $reader->elementMap['{DAV:}root'] = 'Sabre\DAVACL\Xml\Property\Acl';
- $reader->xml($source);
-
- $result = $reader->parse();
-
- }
-
- function testToHtml() {
-
- $privileges = [
- [
- 'principal' => 'principals/evert',
- 'privilege' => '{DAV:}write',
- ],
- [
- 'principal' => 'principals/foo',
- 'privilege' => '{http://example.org/ns}read',
- 'protected' => true,
- ],
- [
- 'principal' => '{DAV:}authenticated',
- 'privilege' => '{DAV:}write',
- ],
- ];
-
- $acl = new Acl($privileges);
- $html = new HtmlOutputHelper(
- '/base/',
- ['DAV:' => 'd']
- );
-
- $expected =
- '<table>' .
- '<tr><th>Principal</th><th>Privilege</th><th></th></tr>' .
- '<tr><td><a href="/base/principals/evert">/base/principals/evert</a></td><td><span title="{DAV:}write">d:write</span></td><td></td></tr>' .
- '<tr><td><a href="/base/principals/foo">/base/principals/foo</a></td><td><span title="{http://example.org/ns}read">{http://example.org/ns}read</span></td><td>(protected)</td></tr>' .
- '<tr><td><span title="{DAV:}authenticated">d:authenticated</span></td><td><span title="{DAV:}write">d:write</span></td><td></td></tr>' .
- '</table>';
-
- $this->assertEquals($expected, $acl->toHtml($html));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Property/AclRestrictionsTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Property/AclRestrictionsTest.php
deleted file mode 100644
index 6d8b83a1285..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Property/AclRestrictionsTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Xml\Property;
-
-use Sabre\DAV;
-use Sabre\HTTP;
-
-class AclRestrictionsTest extends \PHPUnit_Framework_TestCase {
-
- function testConstruct() {
-
- $prop = new AclRestrictions();
- $this->assertInstanceOf('Sabre\DAVACL\Xml\Property\AclRestrictions', $prop);
-
- }
-
- function testSerialize() {
-
- $prop = new AclRestrictions();
- $xml = (new DAV\Server())->xml->write('{DAV:}root', $prop);
-
- $expected = '<?xml version="1.0"?>
-<d:root xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns"><d:grant-only/><d:no-invert/></d:root>';
-
- $this->assertXmlStringEqualsXmlString($expected, $xml);
-
- }
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Property/CurrentUserPrivilegeSetTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Property/CurrentUserPrivilegeSetTest.php
deleted file mode 100644
index d6e6b2d193f..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Property/CurrentUserPrivilegeSetTest.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Xml\Property;
-
-use Sabre\DAV;
-use Sabre\DAV\Browser\HtmlOutputHelper;
-use Sabre\HTTP;
-use Sabre\Xml\Reader;
-
-class CurrentUserPrivilegeSetTest extends \PHPUnit_Framework_TestCase {
-
- function testSerialize() {
-
- $privileges = [
- '{DAV:}read',
- '{DAV:}write',
- ];
- $prop = new CurrentUserPrivilegeSet($privileges);
- $xml = (new DAV\Server())->xml->write('{DAV:}root', $prop);
-
- $expected = <<<XML
-<d:root xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
- <d:privilege>
- <d:read />
- </d:privilege>
- <d:privilege>
- <d:write />
- </d:privilege>
-</d:root>
-XML;
-
-
- $this->assertXmlStringEqualsXmlString($expected, $xml);
-
- }
-
- function testUnserialize() {
-
- $source = '<?xml version="1.0"?>
-<d:root xmlns:d="DAV:">
- <d:privilege>
- <d:write-properties />
- </d:privilege>
- <d:ignoreme />
- <d:privilege>
- <d:read />
- </d:privilege>
-</d:root>
-';
-
- $result = $this->parse($source);
- $this->assertTrue($result->has('{DAV:}read'));
- $this->assertTrue($result->has('{DAV:}write-properties'));
- $this->assertFalse($result->has('{DAV:}bind'));
-
- }
-
- function parse($xml) {
-
- $reader = new Reader();
- $reader->elementMap['{DAV:}root'] = 'Sabre\\DAVACL\\Xml\\Property\\CurrentUserPrivilegeSet';
- $reader->xml($xml);
- $result = $reader->parse();
- return $result['value'];
-
- }
-
- function testToHtml() {
-
- $privileges = ['{DAV:}read', '{DAV:}write'];
-
- $prop = new CurrentUserPrivilegeSet($privileges);
- $html = new HtmlOutputHelper(
- '/base/',
- ['DAV:' => 'd']
- );
-
- $expected =
- '<span title="{DAV:}read">d:read</span>, ' .
- '<span title="{DAV:}write">d:write</span>';
-
- $this->assertEquals($expected, $prop->toHtml($html));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Property/PrincipalTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Property/PrincipalTest.php
deleted file mode 100644
index 876d1073aaa..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Property/PrincipalTest.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Xml\Property;
-
-use Sabre\DAV;
-use Sabre\DAV\Browser\HtmlOutputHelper;
-use Sabre\HTTP;
-use Sabre\Xml\Reader;
-
-class PrincipalTest extends \PHPUnit_Framework_TestCase {
-
- function testSimple() {
-
- $principal = new Principal(Principal::UNAUTHENTICATED);
- $this->assertEquals(Principal::UNAUTHENTICATED, $principal->getType());
- $this->assertNull($principal->getHref());
-
- $principal = new Principal(Principal::AUTHENTICATED);
- $this->assertEquals(Principal::AUTHENTICATED, $principal->getType());
- $this->assertNull($principal->getHref());
-
- $principal = new Principal(Principal::HREF, 'admin');
- $this->assertEquals(Principal::HREF, $principal->getType());
- $this->assertEquals('admin/', $principal->getHref());
-
- }
-
- /**
- * @depends testSimple
- * @expectedException Sabre\DAV\Exception
- */
- function testNoHref() {
-
- $principal = new Principal(Principal::HREF);
-
- }
-
- /**
- * @depends testSimple
- */
- function testSerializeUnAuthenticated() {
-
- $prin = new Principal(Principal::UNAUTHENTICATED);
-
- $xml = (new DAV\Server())->xml->write('{DAV:}principal', $prin);
-
- $this->assertXmlStringEqualsXmlString('
-<d:principal xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
-<d:unauthenticated/>
-</d:principal>', $xml);
-
- }
-
-
- /**
- * @depends testSerializeUnAuthenticated
- */
- function testSerializeAuthenticated() {
-
- $prin = new Principal(Principal::AUTHENTICATED);
- $xml = (new DAV\Server())->xml->write('{DAV:}principal', $prin);
-
- $this->assertXmlStringEqualsXmlString('
-<d:principal xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
-<d:authenticated/>
-</d:principal>', $xml);
-
- }
-
-
- /**
- * @depends testSerializeUnAuthenticated
- */
- function testSerializeHref() {
-
- $prin = new Principal(Principal::HREF, 'principals/admin');
- $xml = (new DAV\Server())->xml->write('{DAV:}principal', $prin, '/');
-
- $this->assertXmlStringEqualsXmlString('
-<d:principal xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
-<d:href>/principals/admin/</d:href>
-</d:principal>', $xml);
-
- }
-
- function testUnserializeHref() {
-
- $xml = '<?xml version="1.0"?>
-<d:principal xmlns:d="DAV:">' .
-'<d:href>/principals/admin</d:href>' .
-'</d:principal>';
-
- $principal = $this->parse($xml);
- $this->assertEquals(Principal::HREF, $principal->getType());
- $this->assertEquals('/principals/admin/', $principal->getHref());
-
- }
-
- function testUnserializeAuthenticated() {
-
- $xml = '<?xml version="1.0"?>
-<d:principal xmlns:d="DAV:">' .
-' <d:authenticated />' .
-'</d:principal>';
-
- $principal = $this->parse($xml);
- $this->assertEquals(Principal::AUTHENTICATED, $principal->getType());
-
- }
-
- function testUnserializeUnauthenticated() {
-
- $xml = '<?xml version="1.0"?>
-<d:principal xmlns:d="DAV:">' .
-' <d:unauthenticated />' .
-'</d:principal>';
-
- $principal = $this->parse($xml);
- $this->assertEquals(Principal::UNAUTHENTICATED, $principal->getType());
-
- }
-
- /**
- * @expectedException Sabre\DAV\Exception\BadRequest
- */
- function testUnserializeUnknown() {
-
- $xml = '<?xml version="1.0"?>
-<d:principal xmlns:d="DAV:">' .
-' <d:foo />' .
-'</d:principal>';
-
- $this->parse($xml);
-
- }
-
- function parse($xml) {
-
- $reader = new Reader();
- $reader->elementMap['{DAV:}principal'] = 'Sabre\\DAVACL\\Xml\\Property\\Principal';
- $reader->xml($xml);
- $result = $reader->parse();
- return $result['value'];
-
- }
-
- /**
- * @depends testSimple
- * @dataProvider htmlProvider
- */
- function testToHtml($principal, $output) {
-
- $html = $principal->toHtml(new HtmlOutputHelper('/', []));
-
- $this->assertXmlStringEqualsXmlString(
- $output,
- $html
- );
-
- }
-
- /**
- * Provides data for the html tests
- *
- * @return array
- */
- function htmlProvider() {
-
- return [
- [
- new Principal(Principal::UNAUTHENTICATED),
- '<em>unauthenticated</em>',
- ],
- [
- new Principal(Principal::AUTHENTICATED),
- '<em>authenticated</em>',
- ],
- [
- new Principal(Principal::ALL),
- '<em>all</em>',
- ],
- [
- new Principal(Principal::HREF, 'principals/admin'),
- '<a href="/principals/admin/">/principals/admin/</a>',
- ],
-
- ];
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Property/SupportedPrivilegeSetTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Property/SupportedPrivilegeSetTest.php
deleted file mode 100644
index 749d349fc7d..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Property/SupportedPrivilegeSetTest.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Xml\Property;
-
-use Sabre\DAV;
-use Sabre\DAV\Browser\HtmlOutputHelper;
-use Sabre\HTTP;
-
-class SupportedPrivilegeSetTest extends \PHPUnit_Framework_TestCase {
-
- function testSimple() {
-
- $prop = new SupportedPrivilegeSet([
- 'privilege' => '{DAV:}all',
- ]);
- $this->assertInstanceOf('Sabre\DAVACL\Xml\Property\SupportedPrivilegeSet', $prop);
-
- }
-
-
- /**
- * @depends testSimple
- */
- function testSerializeSimple() {
-
- $prop = new SupportedPrivilegeSet([]);
-
- $xml = (new DAV\Server())->xml->write('{DAV:}supported-privilege-set', $prop);
-
- $this->assertXmlStringEqualsXmlString('
-<d:supported-privilege-set xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
- <d:supported-privilege>
- <d:privilege>
- <d:all/>
- </d:privilege>
- </d:supported-privilege>
-</d:supported-privilege-set>', $xml);
-
- }
-
- /**
- * @depends testSimple
- */
- function testSerializeAggregate() {
-
- $prop = new SupportedPrivilegeSet([
- '{DAV:}read' => [],
- '{DAV:}write' => [
- 'description' => 'booh',
- ]
- ]);
-
- $xml = (new DAV\Server())->xml->write('{DAV:}supported-privilege-set', $prop);
-
- $this->assertXmlStringEqualsXmlString('
-<d:supported-privilege-set xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
- <d:supported-privilege>
- <d:privilege>
- <d:all/>
- </d:privilege>
- <d:supported-privilege>
- <d:privilege>
- <d:read/>
- </d:privilege>
- </d:supported-privilege>
- <d:supported-privilege>
- <d:privilege>
- <d:write/>
- </d:privilege>
- <d:description>booh</d:description>
- </d:supported-privilege>
- </d:supported-privilege>
-</d:supported-privilege-set>', $xml);
-
- }
-
- function testToHtml() {
-
- $prop = new SupportedPrivilegeSet([
- '{DAV:}read' => [],
- '{DAV:}write' => [
- 'description' => 'booh',
- ],
- ]);
- $html = new HtmlOutputHelper(
- '/base/',
- ['DAV:' => 'd']
- );
-
- $expected = <<<HTML
-<ul class="tree"><li><span title="{DAV:}all">d:all</span>
-<ul>
-<li><span title="{DAV:}read">d:read</span></li>
-<li><span title="{DAV:}write">d:write</span> booh</li>
-</ul></li>
-</ul>
-
-HTML;
-
- $this->assertEquals($expected, $prop->toHtml($html));
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Request/AclPrincipalPropSetReportTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Request/AclPrincipalPropSetReportTest.php
deleted file mode 100644
index bae682f2155..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Request/AclPrincipalPropSetReportTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Xml\Request;
-
-class AclPrincipalPropSetReportTest extends \Sabre\DAV\Xml\XmlTest {
-
- protected $elementMap = [
-
- '{DAV:}acl-principal-prop-set' => 'Sabre\DAVACL\Xml\Request\AclPrincipalPropSetReport',
-
- ];
-
- function testDeserialize() {
-
- $xml = <<<XML
-<?xml version="1.0" encoding="utf-8" ?>
-<D:acl-principal-prop-set xmlns:D="DAV:">
- <D:prop>
- <D:displayname/>
- </D:prop>
-</D:acl-principal-prop-set>
-XML;
-
- $result = $this->parse($xml);
-
- $this->assertEquals(['{DAV:}displayname'], $result['value']->properties);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Request/PrincipalMatchReportTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Request/PrincipalMatchReportTest.php
deleted file mode 100644
index 1431ab34939..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVACL/Xml/Request/PrincipalMatchReportTest.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-namespace Sabre\DAVACL\Xml\Request;
-
-class PrincipalMatchReportTest extends \Sabre\DAV\Xml\XmlTest {
-
- protected $elementMap = [
-
- '{DAV:}principal-match' => 'Sabre\DAVACL\Xml\Request\PrincipalMatchReport',
-
- ];
-
- function testDeserialize() {
-
- $xml = <<<XML
-<?xml version="1.0" encoding="utf-8" ?>
- <D:principal-match xmlns:D="DAV:">
- <D:principal-property>
- <D:owner/>
- </D:principal-property>
- </D:principal-match>
-XML;
-
- $result = $this->parse($xml);
-
- $this->assertEquals(PrincipalMatchReport::PRINCIPAL_PROPERTY, $result['value']->type);
- $this->assertEquals('{DAV:}owner', $result['value']->principalProperty);
-
- }
-
- function testDeserializeSelf() {
-
- $xml = <<<XML
-<?xml version="1.0" encoding="utf-8" ?>
- <D:principal-match xmlns:D="DAV:">
- <D:self />
- <D:prop>
- <D:foo />
- </D:prop>
- </D:principal-match>
-XML;
-
- $result = $this->parse($xml);
-
- $this->assertEquals(PrincipalMatchReport::SELF, $result['value']->type);
- $this->assertNull($result['value']->principalProperty);
- $this->assertEquals(['{DAV:}foo'], $result['value']->properties);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVServerTest.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVServerTest.php
deleted file mode 100644
index 35f240d23fa..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/DAVServerTest.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?php
-
-namespace Sabre;
-
-use Sabre\HTTP\Request;
-use Sabre\HTTP\Response;
-use Sabre\HTTP\Sapi;
-
-/**
- * This class may be used as a basis for other webdav-related unittests.
- *
- * This class is supposed to provide a reasonably big framework to quickly get
- * a testing environment running.
- *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-abstract class DAVServerTest extends \PHPUnit_Framework_TestCase {
-
- protected $setupCalDAV = false;
- protected $setupCardDAV = false;
- protected $setupACL = false;
- protected $setupCalDAVSharing = false;
- protected $setupCalDAVScheduling = false;
- protected $setupCalDAVSubscriptions = false;
- protected $setupCalDAVICSExport = false;
- protected $setupLocks = false;
- protected $setupFiles = false;
- protected $setupSharing = false;
- protected $setupPropertyStorage = false;
-
- /**
- * An array with calendars. Every calendar should have
- * - principaluri
- * - uri
- */
- protected $caldavCalendars = [];
- protected $caldavCalendarObjects = [];
-
- protected $carddavAddressBooks = [];
- protected $carddavCards = [];
-
- /**
- * @var Sabre\DAV\Server
- */
- protected $server;
- protected $tree = [];
-
- protected $caldavBackend;
- protected $carddavBackend;
- protected $principalBackend;
- protected $locksBackend;
- protected $propertyStorageBackend;
-
- /**
- * @var Sabre\CalDAV\Plugin
- */
- protected $caldavPlugin;
-
- /**
- * @var Sabre\CardDAV\Plugin
- */
- protected $carddavPlugin;
-
- /**
- * @var Sabre\DAVACL\Plugin
- */
- protected $aclPlugin;
-
- /**
- * @var Sabre\CalDAV\SharingPlugin
- */
- protected $caldavSharingPlugin;
-
- /**
- * CalDAV scheduling plugin
- *
- * @var CalDAV\Schedule\Plugin
- */
- protected $caldavSchedulePlugin;
-
- /**
- * @var Sabre\DAV\Auth\Plugin
- */
- protected $authPlugin;
-
- /**
- * @var Sabre\DAV\Locks\Plugin
- */
- protected $locksPlugin;
-
- /**
- * Sharing plugin.
- *
- * @var \Sabre\DAV\Sharing\Plugin
- */
- protected $sharingPlugin;
-
- /*
- * @var Sabre\DAV\PropertyStorage\Plugin
- */
- protected $propertyStoragePlugin;
-
- /**
- * If this string is set, we will automatically log in the user with this
- * name.
- */
- protected $autoLogin = null;
-
- function setUp() {
-
- $this->initializeEverything();
-
- }
-
- function initializeEverything() {
-
- $this->setUpBackends();
- $this->setUpTree();
-
- $this->server = new DAV\Server($this->tree);
- $this->server->sapi = new HTTP\SapiMock();
- $this->server->debugExceptions = true;
-
- if ($this->setupCalDAV) {
- $this->caldavPlugin = new CalDAV\Plugin();
- $this->server->addPlugin($this->caldavPlugin);
- }
- if ($this->setupCalDAVSharing || $this->setupSharing) {
- $this->sharingPlugin = new DAV\Sharing\Plugin();
- $this->server->addPlugin($this->sharingPlugin);
- }
- if ($this->setupCalDAVSharing) {
- $this->caldavSharingPlugin = new CalDAV\SharingPlugin();
- $this->server->addPlugin($this->caldavSharingPlugin);
- }
- if ($this->setupCalDAVScheduling) {
- $this->caldavSchedulePlugin = new CalDAV\Schedule\Plugin();
- $this->server->addPlugin($this->caldavSchedulePlugin);
- }
- if ($this->setupCalDAVSubscriptions) {
- $this->server->addPlugin(new CalDAV\Subscriptions\Plugin());
- }
- if ($this->setupCalDAVICSExport) {
- $this->caldavICSExportPlugin = new CalDAV\ICSExportPlugin();
- $this->server->addPlugin($this->caldavICSExportPlugin);
- }
- if ($this->setupCardDAV) {
- $this->carddavPlugin = new CardDAV\Plugin();
- $this->server->addPlugin($this->carddavPlugin);
- }
- if ($this->setupLocks) {
- $this->locksPlugin = new DAV\Locks\Plugin(
- $this->locksBackend
- );
- $this->server->addPlugin($this->locksPlugin);
- }
- if ($this->setupPropertyStorage) {
- $this->propertyStoragePlugin = new DAV\PropertyStorage\Plugin(
- $this->propertyStorageBackend
- );
- $this->server->addPlugin($this->propertyStoragePlugin);
- }
- if ($this->autoLogin) {
- $this->autoLogin($this->autoLogin);
- }
- if ($this->setupACL) {
- $this->aclPlugin = new DAVACL\Plugin();
- if (!$this->autoLogin) {
- $this->aclPlugin->allowUnauthenticatedAccess = false;
- }
- $this->aclPlugin->adminPrincipals = ['principals/admin'];
- $this->server->addPlugin($this->aclPlugin);
- }
-
- }
-
- /**
- * Makes a request, and returns a response object.
- *
- * You can either pass an instance of Sabre\HTTP\Request, or an array,
- * which will then be used as the _SERVER array.
- *
- * If $expectedStatus is set, we'll compare it with the HTTP status of
- * the returned response. If it doesn't match, we'll immediately fail
- * the test.
- *
- * @param array|\Sabre\HTTP\Request $request
- * @param int $expectedStatus
- * @return \Sabre\HTTP\Response
- */
- function request($request, $expectedStatus = null) {
-
- if (is_array($request)) {
- $request = HTTP\Request::createFromServerArray($request);
- }
- $response = new HTTP\ResponseMock();
-
- $this->server->httpRequest = $request;
- $this->server->httpResponse = $response;
- $this->server->exec();
-
- if ($expectedStatus) {
- $responseBody = $expectedStatus !== $response->getStatus() ? $response->getBodyAsString() : '';
- $this->assertEquals($expectedStatus, $response->getStatus(), 'Incorrect HTTP status received for request. Response body: ' . $responseBody);
- }
- return $this->server->httpResponse;
-
- }
-
- /**
- * This function takes a username and sets the server in a state where
- * this user is logged in, and no longer requires an authentication check.
- *
- * @param string $userName
- */
- function autoLogin($userName) {
- $authBackend = new DAV\Auth\Backend\Mock();
- $authBackend->setPrincipal('principals/' . $userName);
- $this->authPlugin = new DAV\Auth\Plugin($authBackend);
-
- // If the auth plugin already exists, we're removing its hooks:
- if ($oldAuth = $this->server->getPlugin('auth')) {
- $this->server->removeListener('beforeMethod', [$oldAuth, 'beforeMethod']);
- }
- $this->server->addPlugin($this->authPlugin);
-
- // This will trigger the actual login procedure
- $this->authPlugin->beforeMethod(new Request(), new Response());
- }
-
- /**
- * Override this to provide your own Tree for your test-case.
- */
- function setUpTree() {
-
- if ($this->setupCalDAV) {
- $this->tree[] = new CalDAV\CalendarRoot(
- $this->principalBackend,
- $this->caldavBackend
- );
- }
- if ($this->setupCardDAV) {
- $this->tree[] = new CardDAV\AddressBookRoot(
- $this->principalBackend,
- $this->carddavBackend
- );
- }
-
- if ($this->setupCalDAV) {
- $this->tree[] = new CalDAV\Principal\Collection(
- $this->principalBackend
- );
- } elseif ($this->setupCardDAV || $this->setupACL) {
- $this->tree[] = new DAVACL\PrincipalCollection(
- $this->principalBackend
- );
- }
- if ($this->setupFiles) {
-
- $this->tree[] = new DAV\Mock\Collection('files');
-
- }
-
- }
-
- function setUpBackends() {
-
- if ($this->setupCalDAVSharing && is_null($this->caldavBackend)) {
- $this->caldavBackend = new CalDAV\Backend\MockSharing($this->caldavCalendars, $this->caldavCalendarObjects);
- }
- if ($this->setupCalDAVSubscriptions && is_null($this->caldavBackend)) {
- $this->caldavBackend = new CalDAV\Backend\MockSubscriptionSupport($this->caldavCalendars, $this->caldavCalendarObjects);
- }
- if ($this->setupCalDAV && is_null($this->caldavBackend)) {
- if ($this->setupCalDAVScheduling) {
- $this->caldavBackend = new CalDAV\Backend\MockScheduling($this->caldavCalendars, $this->caldavCalendarObjects);
- } else {
- $this->caldavBackend = new CalDAV\Backend\Mock($this->caldavCalendars, $this->caldavCalendarObjects);
- }
- }
- if ($this->setupCardDAV && is_null($this->carddavBackend)) {
- $this->carddavBackend = new CardDAV\Backend\Mock($this->carddavAddressBooks, $this->carddavCards);
- }
- if ($this->setupCardDAV || $this->setupCalDAV || $this->setupACL) {
- $this->principalBackend = new DAVACL\PrincipalBackend\Mock();
- }
- if ($this->setupLocks) {
- $this->locksBackend = new DAV\Locks\Backend\Mock();
- }
- if ($this->setupPropertyStorage) {
- $this->propertyStorageBackend = new DAV\PropertyStorage\Backend\Mock();
- }
-
- }
-
-
- function assertHttpStatus($expectedStatus, HTTP\Request $req) {
-
- $resp = $this->request($req);
- $this->assertEquals((int)$expectedStatus, (int)$resp->status, 'Incorrect HTTP status received: ' . $resp->body);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/HTTP/ResponseMock.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/HTTP/ResponseMock.php
deleted file mode 100644
index eb486bf5b89..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/HTTP/ResponseMock.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * HTTP Response Mock object
- *
- * This class exists to make the transition to sabre/http easier.
- *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class ResponseMock extends Response {
-
- /**
- * Making these public.
- */
- public $body;
- public $status;
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/HTTP/SapiMock.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/HTTP/SapiMock.php
deleted file mode 100644
index e2888a9da79..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/HTTP/SapiMock.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-/**
- * HTTP Response Mock object
- *
- * This class exists to make the transition to sabre/http easier.
- *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class SapiMock extends Sapi {
-
- static $sent = 0;
-
- /**
- * Overriding this so nothing is ever echo'd.
- *
- * @param ResponseInterface $response
- * @return void
- */
- static function sendResponse(ResponseInterface $response) {
-
- self::$sent++;
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/Sabre/TestUtil.php b/htdocs/includes/sabre/sabre/dav/tests/Sabre/TestUtil.php
deleted file mode 100644
index 9df94915fb2..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/Sabre/TestUtil.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-namespace Sabre;
-
-class TestUtil {
-
- /**
- * This function deletes all the contents of the temporary directory.
- *
- * @return void
- */
- static function clearTempDir() {
-
- self::deleteTree(SABRE_TEMPDIR, false);
-
- }
-
-
- private static function deleteTree($path, $deleteRoot = true) {
-
- foreach (scandir($path) as $node) {
-
- if ($node == '.' || $node == '..') continue;
- $myPath = $path . '/' . $node;
- if (is_file($myPath)) {
- unlink($myPath);
- } else {
- self::deleteTree($myPath);
- }
-
- }
- if ($deleteRoot) {
- rmdir($path);
- }
-
- }
-
- static function getMySQLDB() {
-
- try {
- $pdo = new \PDO(SABRE_MYSQLDSN, SABRE_MYSQLUSER, SABRE_MYSQLPASS);
- $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
- return $pdo;
- } catch (\PDOException $e) {
- return null;
- }
-
- }
-
- static function getSQLiteDB() {
-
- $pdo = new \PDO('sqlite:' . SABRE_TEMPDIR . '/pdobackend');
- $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
- return $pdo;
-
- }
-
- static function getPgSqlDB() {
-
- //try {
- $pdo = new \PDO(SABRE_PGSQLDSN);
- $pdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
- return $pdo;
- //} catch (\PDOException $e) {
- // return null;
- //}
-
- }
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/dav/tests/bootstrap.php b/htdocs/includes/sabre/sabre/dav/tests/bootstrap.php
deleted file mode 100644
index 26eb32aa284..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/bootstrap.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-set_include_path(__DIR__ . '/../lib/' . PATH_SEPARATOR . __DIR__ . PATH_SEPARATOR . get_include_path());
-
-$autoLoader = include __DIR__ . '/../vendor/autoload.php';
-
-// SabreDAV tests auto loading
-$autoLoader->add('Sabre\\', __DIR__);
-// VObject tests auto loading
-$autoLoader->addPsr4('Sabre\\VObject\\', __DIR__ . '/../vendor/sabre/vobject/tests/VObject');
-$autoLoader->addPsr4('Sabre\\Xml\\', __DIR__ . '/../vendor/sabre/xml/tests/Sabre/Xml');
-
-date_default_timezone_set('UTC');
-
-$config = [
- 'SABRE_TEMPDIR' => dirname(__FILE__) . '/temp/',
- 'SABRE_HASSQLITE' => in_array('sqlite', PDO::getAvailableDrivers()),
- 'SABRE_HASMYSQL' => in_array('mysql', PDO::getAvailableDrivers()),
- 'SABRE_HASPGSQL' => in_array('pgsql', PDO::getAvailableDrivers()),
- 'SABRE_MYSQLDSN' => 'mysql:host=127.0.0.1;dbname=sabredav_test',
- 'SABRE_MYSQLUSER' => 'sabredav',
- 'SABRE_MYSQLPASS' => '',
- 'SABRE_PGSQLDSN' => 'pgsql:host=localhost;dbname=sabredav_test;user=sabredav;password=sabredav',
-];
-
-if (file_exists(__DIR__ . '/config.user.php')) {
- include __DIR__ . '/config.user.php';
- foreach ($userConfig as $key => $value) {
- $config[$key] = $value;
- }
-}
-
-foreach ($config as $key => $value) {
- if (!defined($key)) define($key, $value);
-}
-
-if (!file_exists(SABRE_TEMPDIR)) mkdir(SABRE_TEMPDIR);
-if (file_exists('.sabredav')) unlink('.sabredav');
diff --git a/htdocs/includes/sabre/sabre/dav/tests/phpcs/ruleset.xml b/htdocs/includes/sabre/sabre/dav/tests/phpcs/ruleset.xml
deleted file mode 100644
index ec2c4c84b1d..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/phpcs/ruleset.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="sabre.php">
- <description>sabre.io codesniffer ruleset</description>
-
- <!-- Include the whole PSR-1 standard -->
- <rule ref="PSR1" />
-
- <!-- All PHP files MUST use the Unix LF (linefeed) line ending. -->
- <rule ref="Generic.Files.LineEndings">
- <properties>
- <property name="eolChar" value="\n"/>
- </properties>
- </rule>
-
- <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
- <rule ref="Zend.Files.ClosingTag"/>
-
- <!-- There MUST NOT be trailing whitespace at the end of non-blank lines. -->
- <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
- <properties>
- <property name="ignoreBlankLines" value="true"/>
- </properties>
- </rule>
-
- <!-- There MUST NOT be more than one statement per line. -->
- <rule ref="Generic.Formatting.DisallowMultipleStatements"/>
-
- <rule ref="Generic.WhiteSpace.ScopeIndent">
- <properties>
- <property name="ignoreIndentationTokens" type="array" value="T_COMMENT,T_DOC_COMMENT"/>
- </properties>
- </rule>
- <rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
-
- <!-- PHP keywords MUST be in lower case. -->
- <rule ref="Generic.PHP.LowerCaseKeyword"/>
-
- <!-- The PHP constants true, false, and null MUST be in lower case. -->
- <rule ref="Generic.PHP.LowerCaseConstant"/>
-
- <!-- <rule ref="Squiz.Scope.MethodScope"/> -->
- <rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing"/>
-
- <!-- In the argument list, there MUST NOT be a space before each comma, and there MUST be one space after each comma. -->
- <!--
- <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing">
- <properties>
- <property name="equalsSpacing" value="1"/>
- </properties>
- </rule>
- <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint">
- <severity>0</severity>
- </rule>
- -->
- <rule ref="PEAR.WhiteSpace.ScopeClosingBrace"/>
-
-</ruleset>
diff --git a/htdocs/includes/sabre/sabre/dav/tests/phpunit.xml.dist b/htdocs/includes/sabre/sabre/dav/tests/phpunit.xml.dist
deleted file mode 100644
index 453fabb82ad..00000000000
--- a/htdocs/includes/sabre/sabre/dav/tests/phpunit.xml.dist
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<phpunit
- colors="true"
- bootstrap="bootstrap.php"
- convertErrorsToExceptions="true"
- convertNoticesToExceptions="true"
- convertWarningsToExceptions="true"
- beStrictAboutTestsThatDoNotTestAnything="true"
- beStrictAboutOutputDuringTests="true"
- beStrictAboutTestSize="true">
-
- <testsuite name="sabre-event">
- <directory>../vendor/sabre/event/tests/</directory>
- </testsuite>
- <testsuite name="sabre-uri">
- <directory>../vendor/sabre/uri/tests/</directory>
- </testsuite>
- <testsuite name="sabre-xml">
- <directory>../vendor/sabre/xml/tests/Sabre/Xml/</directory>
- </testsuite>
- <testsuite name="sabre-http">
- <directory>../vendor/sabre/http/tests/HTTP</directory>
- </testsuite>
- <testsuite name="sabre-vobject">
- <directory>../vendor/sabre/vobject/tests/VObject</directory>
- </testsuite>
-
- <testsuite name="sabre-dav">
- <directory>Sabre/DAV</directory>
- </testsuite>
- <testsuite name="sabre-davacl">
- <directory>Sabre/DAVACL</directory>
- </testsuite>
- <testsuite name="sabre-caldav">
- <directory>Sabre/CalDAV</directory>
- </testsuite>
- <testsuite name="sabre-carddav">
- <directory>Sabre/CardDAV</directory>
- </testsuite>
-
- <filter>
- <whitelist addUncoveredFilesFromWhitelist="true">
- <directory suffix=".php">../lib/</directory>
- </whitelist>
- </filter>
-</phpunit>
diff --git a/htdocs/includes/sabre/sabre/event/tests/ContinueCallbackTest.php b/htdocs/includes/sabre/sabre/event/tests/ContinueCallbackTest.php
deleted file mode 100644
index c469913795f..00000000000
--- a/htdocs/includes/sabre/sabre/event/tests/ContinueCallbackTest.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-namespace Sabre\Event;
-
-class ContinueCallbackTest extends \PHPUnit_Framework_TestCase {
-
- function testContinueCallBack() {
-
- $ee = new EventEmitter();
-
- $handlerCounter = 0;
- $bla = function() use (&$handlerCounter) {
- $handlerCounter++;
- };
- $ee->on('foo', $bla);
- $ee->on('foo', $bla);
- $ee->on('foo', $bla);
-
- $continueCounter = 0;
- $r = $ee->emit('foo', [], function() use (&$continueCounter) {
- $continueCounter++;
- return true;
- });
- $this->assertTrue($r);
- $this->assertEquals(3, $handlerCounter);
- $this->assertEquals(2, $continueCounter);
-
- }
-
- function testContinueCallBackBreak() {
-
- $ee = new EventEmitter();
-
- $handlerCounter = 0;
- $bla = function() use (&$handlerCounter) {
- $handlerCounter++;
- };
- $ee->on('foo', $bla);
- $ee->on('foo', $bla);
- $ee->on('foo', $bla);
-
- $continueCounter = 0;
- $r = $ee->emit('foo', [], function() use (&$continueCounter) {
- $continueCounter++;
- return false;
- });
- $this->assertTrue($r);
- $this->assertEquals(1, $handlerCounter);
- $this->assertEquals(1, $continueCounter);
-
- }
-
- function testContinueCallBackBreakByHandler() {
-
- $ee = new EventEmitter();
-
- $handlerCounter = 0;
- $bla = function() use (&$handlerCounter) {
- $handlerCounter++;
- return false;
- };
- $ee->on('foo', $bla);
- $ee->on('foo', $bla);
- $ee->on('foo', $bla);
-
- $continueCounter = 0;
- $r = $ee->emit('foo', [], function() use (&$continueCounter) {
- $continueCounter++;
- return false;
- });
- $this->assertFalse($r);
- $this->assertEquals(1, $handlerCounter);
- $this->assertEquals(0, $continueCounter);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/event/tests/CoroutineTest.php b/htdocs/includes/sabre/sabre/event/tests/CoroutineTest.php
deleted file mode 100644
index 6e4b666b042..00000000000
--- a/htdocs/includes/sabre/sabre/event/tests/CoroutineTest.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-
-namespace Sabre\Event;
-
-class CoroutineTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * @expectedException \InvalidArgumentException
- */
- function testNonGenerator() {
-
- coroutine(function() {});
-
- }
-
- function testBasicCoroutine() {
-
- $start = 0;
-
- coroutine(function() use (&$start) {
-
- $start += 1;
- yield;
-
- });
-
- $this->assertEquals(1, $start);
-
- }
-
- function testFulfilledPromise() {
-
- $start = 0;
- $promise = new Promise(function($fulfill, $reject) {
- $fulfill(2);
- });
-
- coroutine(function() use (&$start, $promise) {
-
- $start += 1;
- $start += (yield $promise);
-
- });
-
- Loop\run();
- $this->assertEquals(3, $start);
-
- }
-
- function testRejectedPromise() {
-
- $start = 0;
- $promise = new Promise(function($fulfill, $reject) {
- $reject(2);
- });
-
- coroutine(function() use (&$start, $promise) {
-
- $start += 1;
- try {
- $start += (yield $promise);
- // This line is unreachable, but it's our control
- $start += 4;
- } catch (\Exception $e) {
- $start += $e->getMessage();
- }
-
- });
-
- Loop\run();
- $this->assertEquals(3, $start);
-
- }
-
- function testRejectedPromiseException() {
-
- $start = 0;
- $promise = new Promise(function($fulfill, $reject) {
- $reject(new \LogicException('2'));
- });
-
- coroutine(function() use (&$start, $promise) {
-
- $start += 1;
- try {
- $start += (yield $promise);
- // This line is unreachable, but it's our control
- $start += 4;
- } catch (\LogicException $e) {
- $start += $e->getMessage();
- }
-
- });
-
- Loop\run();
- $this->assertEquals(3, $start);
-
- }
-
- function testRejectedPromiseArray() {
-
- $start = 0;
- $promise = new Promise(function($fulfill, $reject) {
- $reject([]);
- });
-
- coroutine(function() use (&$start, $promise) {
-
- $start += 1;
- try {
- $start += (yield $promise);
- // This line is unreachable, but it's our control
- $start += 4;
- } catch (\Exception $e) {
- $this->assertTrue(strpos($e->getMessage(), 'Promise was rejected with') === 0);
- $start += 2;
- }
-
- })->wait();
-
- $this->assertEquals(3, $start);
-
- }
-
- function testFulfilledPromiseAsync() {
-
- $start = 0;
- $promise = new Promise();
- coroutine(function() use (&$start, $promise) {
-
- $start += 1;
- $start += (yield $promise);
-
- });
- Loop\run();
-
- $this->assertEquals(1, $start);
-
- $promise->fulfill(2);
- Loop\run();
-
- $this->assertEquals(3, $start);
-
- }
-
- function testRejectedPromiseAsync() {
-
- $start = 0;
- $promise = new Promise();
- coroutine(function() use (&$start, $promise) {
-
- $start += 1;
- try {
- $start += (yield $promise);
- // This line is unreachable, but it's our control
- $start += 4;
- } catch (\Exception $e) {
- $start += $e->getMessage();
- }
-
- });
-
- $this->assertEquals(1, $start);
-
- $promise->reject(new \Exception(2));
- Loop\run();
-
- $this->assertEquals(3, $start);
-
- }
-
- function testCoroutineException() {
-
- $start = 0;
- coroutine(function() use (&$start) {
-
- $start += 1;
- $start += (yield 2);
-
- throw new \Exception('4');
-
- })->error(function($e) use (&$start) {
-
- $start += $e->getMessage();
-
- });
- Loop\run();
-
- $this->assertEquals(7, $start);
-
- }
-
- function testDeepException() {
-
- $start = 0;
- $promise = new Promise();
- coroutine(function() use (&$start, $promise) {
-
- $start += 1;
- $start += (yield $promise);
-
- })->error(function($e) use (&$start) {
-
- $start += $e->getMessage();
-
- });
-
- $this->assertEquals(1, $start);
-
- $promise->reject(new \Exception(2));
- Loop\run();
-
- $this->assertEquals(3, $start);
-
- }
-
- function testResolveToLastYield() {
-
- $ok = false;
- coroutine(function() {
-
- yield 1;
- yield 2;
- $hello = 'hi';
-
- })->then(function($value) use (&$ok) {
- $this->assertEquals(2, $value);
- $ok = true;
- })->error(function($reason) {
- $this->fail($reason);
- });
- Loop\run();
-
- $this->assertTrue($ok);
-
- }
-
- function testResolveToLastYieldPromise() {
-
- $ok = false;
-
- $promise = new Promise();
-
- coroutine(function() use ($promise) {
-
- yield 'fail';
- yield $promise;
- $hello = 'hi';
-
- })->then(function($value) use (&$ok) {
- $ok = $value;
- $this->fail($reason);
- });
-
- $promise->fulfill('omg it worked');
- Loop\run();
-
- $this->assertEquals('omg it worked', $ok);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/event/tests/EventEmitterTest.php b/htdocs/includes/sabre/sabre/event/tests/EventEmitterTest.php
deleted file mode 100644
index df08e9cd84a..00000000000
--- a/htdocs/includes/sabre/sabre/event/tests/EventEmitterTest.php
+++ /dev/null
@@ -1,318 +0,0 @@
-<?php
-
-namespace Sabre\Event;
-
-class EventEmitterTest extends \PHPUnit_Framework_TestCase {
-
- function testInit() {
-
- $ee = new EventEmitter();
- $this->assertInstanceOf('Sabre\\Event\\EventEmitter', $ee);
-
- }
-
- function testListeners() {
-
- $ee = new EventEmitter();
-
- $callback1 = function() { };
- $callback2 = function() { };
- $ee->on('foo', $callback1, 200);
- $ee->on('foo', $callback2, 100);
-
- $this->assertEquals([$callback2, $callback1], $ee->listeners('foo'));
-
- }
-
- /**
- * @depends testInit
- */
- function testHandleEvent() {
-
- $argResult = null;
-
- $ee = new EventEmitter();
- $ee->on('foo', function($arg) use (&$argResult) {
-
- $argResult = $arg;
-
- });
-
- $this->assertTrue(
- $ee->emit('foo', ['bar'])
- );
-
- $this->assertEquals('bar', $argResult);
-
- }
-
- /**
- * @depends testHandleEvent
- */
- function testCancelEvent() {
-
- $argResult = 0;
-
- $ee = new EventEmitter();
- $ee->on('foo', function($arg) use (&$argResult) {
-
- $argResult = 1;
- return false;
-
- });
- $ee->on('foo', function($arg) use (&$argResult) {
-
- $argResult = 2;
-
- });
-
- $this->assertFalse(
- $ee->emit('foo', ['bar'])
- );
-
- $this->assertEquals(1, $argResult);
-
- }
-
- /**
- * @depends testCancelEvent
- */
- function testPriority() {
-
- $argResult = 0;
-
- $ee = new EventEmitter();
- $ee->on('foo', function($arg) use (&$argResult) {
-
- $argResult = 1;
- return false;
-
- });
- $ee->on('foo', function($arg) use (&$argResult) {
-
- $argResult = 2;
- return false;
-
- }, 1);
-
- $this->assertFalse(
- $ee->emit('foo', ['bar'])
- );
-
- $this->assertEquals(2, $argResult);
-
- }
-
- /**
- * @depends testPriority
- */
- function testPriority2() {
-
- $result = [];
- $ee = new EventEmitter();
-
- $ee->on('foo', function() use (&$result) {
-
- $result[] = 'a';
-
- }, 200);
- $ee->on('foo', function() use (&$result) {
-
- $result[] = 'b';
-
- }, 50);
- $ee->on('foo', function() use (&$result) {
-
- $result[] = 'c';
-
- }, 300);
- $ee->on('foo', function() use (&$result) {
-
- $result[] = 'd';
-
- });
-
- $ee->emit('foo');
- $this->assertEquals(['b', 'd', 'a', 'c'], $result);
-
- }
-
- function testRemoveListener() {
-
- $result = false;
-
- $callBack = function() use (&$result) {
-
- $result = true;
-
- };
-
- $ee = new EventEmitter();
-
- $ee->on('foo', $callBack);
-
- $ee->emit('foo');
- $this->assertTrue($result);
- $result = false;
-
- $this->assertTrue(
- $ee->removeListener('foo', $callBack)
- );
-
- $ee->emit('foo');
- $this->assertFalse($result);
-
- }
-
- function testRemoveUnknownListener() {
-
- $result = false;
-
- $callBack = function() use (&$result) {
-
- $result = true;
-
- };
-
- $ee = new EventEmitter();
-
- $ee->on('foo', $callBack);
-
- $ee->emit('foo');
- $this->assertTrue($result);
- $result = false;
-
- $this->assertFalse($ee->removeListener('bar', $callBack));
-
- $ee->emit('foo');
- $this->assertTrue($result);
-
- }
-
- function testRemoveListenerTwice() {
-
- $result = false;
-
- $callBack = function() use (&$result) {
-
- $result = true;
-
- };
-
- $ee = new EventEmitter();
-
- $ee->on('foo', $callBack);
-
- $ee->emit('foo');
- $this->assertTrue($result);
- $result = false;
-
- $this->assertTrue(
- $ee->removeListener('foo', $callBack)
- );
- $this->assertFalse(
- $ee->removeListener('foo', $callBack)
- );
-
- $ee->emit('foo');
- $this->assertFalse($result);
-
- }
-
- function testRemoveAllListeners() {
-
- $result = false;
- $callBack = function() use (&$result) {
-
- $result = true;
-
- };
-
- $ee = new EventEmitter();
- $ee->on('foo', $callBack);
-
- $ee->emit('foo');
- $this->assertTrue($result);
- $result = false;
-
- $ee->removeAllListeners('foo');
-
- $ee->emit('foo');
- $this->assertFalse($result);
-
- }
-
- function testRemoveAllListenersNoArg() {
-
- $result = false;
-
- $callBack = function() use (&$result) {
-
- $result = true;
-
- };
-
-
- $ee = new EventEmitter();
- $ee->on('foo', $callBack);
-
- $ee->emit('foo');
- $this->assertTrue($result);
- $result = false;
-
- $ee->removeAllListeners();
-
- $ee->emit('foo');
- $this->assertFalse($result);
-
- }
-
- function testOnce() {
-
- $result = 0;
-
- $callBack = function() use (&$result) {
-
- $result++;
-
- };
-
- $ee = new EventEmitter();
- $ee->once('foo', $callBack);
-
- $ee->emit('foo');
- $ee->emit('foo');
-
- $this->assertEquals(1, $result);
-
- }
-
- /**
- * @depends testCancelEvent
- */
- function testPriorityOnce() {
-
- $argResult = 0;
-
- $ee = new EventEmitter();
- $ee->once('foo', function($arg) use (&$argResult) {
-
- $argResult = 1;
- return false;
-
- });
- $ee->once('foo', function($arg) use (&$argResult) {
-
- $argResult = 2;
- return false;
-
- }, 1);
-
- $this->assertFalse(
- $ee->emit('foo', ['bar'])
- );
-
- $this->assertEquals(2, $argResult);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/event/tests/Loop/FunctionsTest.php b/htdocs/includes/sabre/sabre/event/tests/Loop/FunctionsTest.php
deleted file mode 100644
index 08bf306c37f..00000000000
--- a/htdocs/includes/sabre/sabre/event/tests/Loop/FunctionsTest.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-namespace Sabre\Event\Loop;
-
-class FunctionsTest extends \PHPUnit_Framework_TestCase {
-
- function setUp() {
-
- // Always creating a fresh loop object.
- instance(new Loop());
-
- }
-
- function tearDown() {
-
- // Removing the global loop object.
- instance(null);
-
- }
-
- function testNextTick() {
-
- $check = 0;
- nextTick(function() use (&$check) {
-
- $check++;
-
- });
-
- run();
-
- $this->assertEquals(1, $check);
-
- }
-
- function testTimeout() {
-
- $check = 0;
- setTimeout(function() use (&$check) {
-
- $check++;
-
- }, 0.02);
-
- run();
-
- $this->assertEquals(1, $check);
-
- }
-
- function testTimeoutOrder() {
-
- $check = [];
- setTimeout(function() use (&$check) {
-
- $check[] = 'a';
-
- }, 0.2);
- setTimeout(function() use (&$check) {
-
- $check[] = 'b';
-
- }, 0.1);
- setTimeout(function() use (&$check) {
-
- $check[] = 'c';
-
- }, 0.3);
-
- run();
-
- $this->assertEquals(['b', 'a', 'c'], $check);
-
- }
-
- function testSetInterval() {
-
- $check = 0;
- $intervalId = null;
- $intervalId = setInterval(function() use (&$check, &$intervalId) {
-
- $check++;
- if ($check > 5) {
- clearInterval($intervalId);
- }
-
- }, 0.02);
-
- run();
- $this->assertEquals(6, $check);
-
- }
-
- function testAddWriteStream() {
-
- $h = fopen('php://temp', 'r+');
- addWriteStream($h, function() use ($h) {
-
- fwrite($h, 'hello world');
- removeWriteStream($h);
-
- });
- run();
- rewind($h);
- $this->assertEquals('hello world', stream_get_contents($h));
-
- }
-
- function testAddReadStream() {
-
- $h = fopen('php://temp', 'r+');
- fwrite($h, 'hello world');
- rewind($h);
-
- $result = null;
-
- addReadStream($h, function() use ($h, &$result) {
-
- $result = fgets($h);
- removeReadStream($h);
-
- });
- run();
- $this->assertEquals('hello world', $result);
-
- }
-
- function testStop() {
-
- $check = 0;
- setTimeout(function() use (&$check) {
- $check++;
- }, 200);
-
- nextTick(function() {
- stop();
- });
- run();
-
- $this->assertEquals(0, $check);
-
- }
-
- function testTick() {
-
- $check = 0;
- setTimeout(function() use (&$check) {
- $check++;
- }, 1);
-
- nextTick(function() use (&$check) {
- $check++;
- });
- tick();
-
- $this->assertEquals(1, $check);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/event/tests/Loop/LoopTest.php b/htdocs/includes/sabre/sabre/event/tests/Loop/LoopTest.php
deleted file mode 100644
index a9cf551bddb..00000000000
--- a/htdocs/includes/sabre/sabre/event/tests/Loop/LoopTest.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-namespace Sabre\Event\Loop;
-
-class LoopTest extends \PHPUnit_Framework_TestCase {
-
- function testNextTick() {
-
- $loop = new Loop();
- $check = 0;
- $loop->nextTick(function() use (&$check) {
-
- $check++;
-
- });
-
- $loop->run();
-
- $this->assertEquals(1, $check);
-
- }
-
- function testTimeout() {
-
- $loop = new Loop();
- $check = 0;
- $loop->setTimeout(function() use (&$check) {
-
- $check++;
-
- }, 0.02);
-
- $loop->run();
-
- $this->assertEquals(1, $check);
-
- }
-
- function testTimeoutOrder() {
-
- $loop = new Loop();
- $check = [];
- $loop->setTimeout(function() use (&$check) {
-
- $check[] = 'a';
-
- }, 0.2);
- $loop->setTimeout(function() use (&$check) {
-
- $check[] = 'b';
-
- }, 0.1);
- $loop->setTimeout(function() use (&$check) {
-
- $check[] = 'c';
-
- }, 0.3);
-
- $loop->run();
-
- $this->assertEquals(['b', 'a', 'c'], $check);
-
- }
-
- function testSetInterval() {
-
- $loop = new Loop();
- $check = 0;
- $intervalId = null;
- $intervalId = $loop->setInterval(function() use (&$check, &$intervalId, $loop) {
-
- $check++;
- if ($check > 5) {
- $loop->clearInterval($intervalId);
- }
-
- }, 0.02);
-
- $loop->run();
- $this->assertEquals(6, $check);
-
- }
-
- function testAddWriteStream() {
-
- $h = fopen('php://temp', 'r+');
- $loop = new Loop();
- $loop->addWriteStream($h, function() use ($h, $loop) {
-
- fwrite($h, 'hello world');
- $loop->removeWriteStream($h);
-
- });
- $loop->run();
- rewind($h);
- $this->assertEquals('hello world', stream_get_contents($h));
-
- }
-
- function testAddReadStream() {
-
- $h = fopen('php://temp', 'r+');
- fwrite($h, 'hello world');
- rewind($h);
-
- $loop = new Loop();
-
- $result = null;
-
- $loop->addReadStream($h, function() use ($h, $loop, &$result) {
-
- $result = fgets($h);
- $loop->removeReadStream($h);
-
- });
- $loop->run();
- $this->assertEquals('hello world', $result);
-
- }
-
- function testStop() {
-
- $check = 0;
- $loop = new Loop();
- $loop->setTimeout(function() use (&$check) {
- $check++;
- }, 200);
-
- $loop->nextTick(function() use ($loop) {
- $loop->stop();
- });
- $loop->run();
-
- $this->assertEquals(0, $check);
-
- }
-
- function testTick() {
-
- $check = 0;
- $loop = new Loop();
- $loop->setTimeout(function() use (&$check) {
- $check++;
- }, 1);
-
- $loop->nextTick(function() use ($loop, &$check) {
- $check++;
- });
- $loop->tick();
-
- $this->assertEquals(1, $check);
-
- }
-
- /**
- * Here we add a new nextTick function as we're in the middle of a current
- * nextTick.
- */
- function testNextTickStacking() {
-
- $loop = new Loop();
- $check = 0;
- $loop->nextTick(function() use (&$check, $loop) {
-
- $loop->nextTick(function() use (&$check) {
-
- $check++;
-
- });
- $check++;
-
- });
-
- $loop->run();
-
- $this->assertEquals(2, $check);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/event/tests/Promise/FunctionsTest.php b/htdocs/includes/sabre/sabre/event/tests/Promise/FunctionsTest.php
deleted file mode 100644
index 51e47ae297b..00000000000
--- a/htdocs/includes/sabre/sabre/event/tests/Promise/FunctionsTest.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-
-namespace Sabre\Event\Promise;
-
-use Sabre\Event\Loop;
-use Sabre\Event\Promise;
-
-class FunctionsTest extends \PHPUnit_Framework_TestCase {
-
- function testAll() {
-
- $promise1 = new Promise();
- $promise2 = new Promise();
-
- $finalValue = 0;
- Promise\all([$promise1, $promise2])->then(function($value) use (&$finalValue) {
-
- $finalValue = $value;
-
- });
-
- $promise1->fulfill(1);
- Loop\run();
- $this->assertEquals(0, $finalValue);
-
- $promise2->fulfill(2);
- Loop\run();
- $this->assertEquals([1, 2], $finalValue);
-
- }
-
- function testAllReject() {
-
- $promise1 = new Promise();
- $promise2 = new Promise();
-
- $finalValue = 0;
- Promise\all([$promise1, $promise2])->then(
- function($value) use (&$finalValue) {
- $finalValue = 'foo';
- return 'test';
- },
- function($value) use (&$finalValue) {
- $finalValue = $value;
- }
- );
-
- $promise1->reject(1);
- Loop\run();
- $this->assertEquals(1, $finalValue);
- $promise2->reject(2);
- Loop\run();
- $this->assertEquals(1, $finalValue);
-
- }
-
- function testAllRejectThenResolve() {
-
- $promise1 = new Promise();
- $promise2 = new Promise();
-
- $finalValue = 0;
- Promise\all([$promise1, $promise2])->then(
- function($value) use (&$finalValue) {
- $finalValue = 'foo';
- return 'test';
- },
- function($value) use (&$finalValue) {
- $finalValue = $value;
- }
- );
-
- $promise1->reject(1);
- Loop\run();
- $this->assertEquals(1, $finalValue);
- $promise2->fulfill(2);
- Loop\run();
- $this->assertEquals(1, $finalValue);
-
- }
-
- function testRace() {
-
- $promise1 = new Promise();
- $promise2 = new Promise();
-
- $finalValue = 0;
- Promise\race([$promise1, $promise2])->then(
- function($value) use (&$finalValue) {
- $finalValue = $value;
- },
- function($value) use (&$finalValue) {
- $finalValue = $value;
- }
- );
-
- $promise1->fulfill(1);
- Loop\run();
- $this->assertEquals(1, $finalValue);
- $promise2->fulfill(2);
- Loop\run();
- $this->assertEquals(1, $finalValue);
-
- }
-
- function testRaceReject() {
-
- $promise1 = new Promise();
- $promise2 = new Promise();
-
- $finalValue = 0;
- Promise\race([$promise1, $promise2])->then(
- function($value) use (&$finalValue) {
- $finalValue = $value;
- },
- function($value) use (&$finalValue) {
- $finalValue = $value;
- }
- );
-
- $promise1->reject(1);
- Loop\run();
- $this->assertEquals(1, $finalValue);
- $promise2->reject(2);
- Loop\run();
- $this->assertEquals(1, $finalValue);
-
- }
-
- function testResolve() {
-
- $finalValue = 0;
-
- $promise = resolve(1);
- $promise->then(function($value) use (&$finalValue) {
-
- $finalValue = $value;
-
- });
-
- $this->assertEquals(0, $finalValue);
- Loop\run();
- $this->assertEquals(1, $finalValue);
-
- }
-
- /**
- * @expectedException \Exception
- */
- function testResolvePromise() {
-
- $finalValue = 0;
-
- $promise = new Promise();
- $promise->reject(new \Exception('uh oh'));
-
- $newPromise = resolve($promise);
- $newPromise->wait();
-
- }
-
- function testReject() {
-
- $finalValue = 0;
-
- $promise = reject(1);
- $promise->then(function($value) use (&$finalValue) {
-
- $finalValue = 'im broken';
-
- }, function($reason) use (&$finalValue) {
-
- $finalValue = $reason;
-
- });
-
- $this->assertEquals(0, $finalValue);
- Loop\run();
- $this->assertEquals(1, $finalValue);
-
- }
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/event/tests/Promise/PromiseTest.php b/htdocs/includes/sabre/sabre/event/tests/Promise/PromiseTest.php
deleted file mode 100644
index 69838397881..00000000000
--- a/htdocs/includes/sabre/sabre/event/tests/Promise/PromiseTest.php
+++ /dev/null
@@ -1,341 +0,0 @@
-<?php
-
-namespace Sabre\Event\Promise;
-
-use Sabre\Event\Loop;
-use Sabre\Event\Promise;
-
-class PromiseTest extends \PHPUnit_Framework_TestCase {
-
- function testSuccess() {
-
- $finalValue = 0;
- $promise = new Promise();
- $promise->fulfill(1);
-
- $promise->then(function($value) use (&$finalValue) {
- $finalValue = $value + 2;
- });
- Loop\run();
-
- $this->assertEquals(3, $finalValue);
-
- }
-
- function testFail() {
-
- $finalValue = 0;
- $promise = new Promise();
- $promise->reject(1);
-
- $promise->then(null, function($value) use (&$finalValue) {
- $finalValue = $value + 2;
- });
- Loop\run();
-
- $this->assertEquals(3, $finalValue);
-
- }
-
- function testChain() {
-
- $finalValue = 0;
- $promise = new Promise();
- $promise->fulfill(1);
-
- $promise->then(function($value) use (&$finalValue) {
- $finalValue = $value + 2;
- return $finalValue;
- })->then(function($value) use (&$finalValue) {
- $finalValue = $value + 4;
- return $finalValue;
- });
- Loop\run();
-
- $this->assertEquals(7, $finalValue);
-
- }
- function testChainPromise() {
-
- $finalValue = 0;
- $promise = new Promise();
- $promise->fulfill(1);
-
- $subPromise = new Promise();
-
- $promise->then(function($value) use ($subPromise) {
- return $subPromise;
- })->then(function($value) use (&$finalValue) {
- $finalValue = $value + 4;
- return $finalValue;
- });
-
- $subPromise->fulfill(2);
- Loop\run();
-
- $this->assertEquals(6, $finalValue);
-
- }
-
- function testPendingResult() {
-
- $finalValue = 0;
- $promise = new Promise();
-
- $promise->then(function($value) use (&$finalValue) {
- $finalValue = $value + 2;
- });
-
- $promise->fulfill(4);
- Loop\run();
-
- $this->assertEquals(6, $finalValue);
-
- }
-
- function testPendingFail() {
-
- $finalValue = 0;
- $promise = new Promise();
-
- $promise->then(null, function($value) use (&$finalValue) {
- $finalValue = $value + 2;
- });
-
- $promise->reject(4);
- Loop\run();
-
- $this->assertEquals(6, $finalValue);
-
- }
-
- function testExecutorSuccess() {
-
- $promise = (new Promise(function($success, $fail) {
-
- $success('hi');
-
- }))->then(function($result) use (&$realResult) {
-
- $realResult = $result;
-
- });
- Loop\run();
-
- $this->assertEquals('hi', $realResult);
-
- }
-
- function testExecutorFail() {
-
- $promise = (new Promise(function($success, $fail) {
-
- $fail('hi');
-
- }))->then(function($result) use (&$realResult) {
-
- $realResult = 'incorrect';
-
- }, function($reason) use (&$realResult) {
-
- $realResult = $reason;
-
- });
- Loop\run();
-
- $this->assertEquals('hi', $realResult);
-
- }
-
- /**
- * @expectedException \Sabre\Event\PromiseAlreadyResolvedException
- */
- function testFulfillTwice() {
-
- $promise = new Promise();
- $promise->fulfill(1);
- $promise->fulfill(1);
-
- }
-
- /**
- * @expectedException \Sabre\Event\PromiseAlreadyResolvedException
- */
- function testRejectTwice() {
-
- $promise = new Promise();
- $promise->reject(1);
- $promise->reject(1);
-
- }
-
- function testFromFailureHandler() {
-
- $ok = 0;
- $promise = new Promise();
- $promise->otherwise(function($reason) {
-
- $this->assertEquals('foo', $reason);
- throw new \Exception('hi');
-
- })->then(function() use (&$ok) {
-
- $ok = -1;
-
- }, function() use (&$ok) {
-
- $ok = 1;
-
- });
-
- $this->assertEquals(0, $ok);
- $promise->reject('foo');
- Loop\run();
-
- $this->assertEquals(1, $ok);
-
- }
-
- function testAll() {
-
- $promise1 = new Promise();
- $promise2 = new Promise();
-
- $finalValue = 0;
- Promise::all([$promise1, $promise2])->then(function($value) use (&$finalValue) {
-
- $finalValue = $value;
-
- });
-
- $promise1->fulfill(1);
- Loop\run();
- $this->assertEquals(0, $finalValue);
-
- $promise2->fulfill(2);
- Loop\run();
- $this->assertEquals([1, 2], $finalValue);
-
- }
-
- function testAllReject() {
-
- $promise1 = new Promise();
- $promise2 = new Promise();
-
- $finalValue = 0;
- Promise::all([$promise1, $promise2])->then(
- function($value) use (&$finalValue) {
- $finalValue = 'foo';
- return 'test';
- },
- function($value) use (&$finalValue) {
- $finalValue = $value;
- }
- );
-
- $promise1->reject(1);
- Loop\run();
- $this->assertEquals(1, $finalValue);
- $promise2->reject(2);
- Loop\run();
- $this->assertEquals(1, $finalValue);
-
- }
-
- function testAllRejectThenResolve() {
-
- $promise1 = new Promise();
- $promise2 = new Promise();
-
- $finalValue = 0;
- Promise::all([$promise1, $promise2])->then(
- function($value) use (&$finalValue) {
- $finalValue = 'foo';
- return 'test';
- },
- function($value) use (&$finalValue) {
- $finalValue = $value;
- }
- );
-
- $promise1->reject(1);
- Loop\run();
- $this->assertEquals(1, $finalValue);
- $promise2->fulfill(2);
- Loop\run();
- $this->assertEquals(1, $finalValue);
-
- }
-
- function testWaitResolve() {
-
- $promise = new Promise();
- Loop\nextTick(function() use ($promise) {
- $promise->fulfill(1);
- });
- $this->assertEquals(
- 1,
- $promise->wait()
- );
-
- }
-
- /**
- * @expectedException \LogicException
- */
- function testWaitWillNeverResolve() {
-
- $promise = new Promise();
- $promise->wait();
-
- }
-
- function testWaitRejectedException() {
-
- $promise = new Promise();
- Loop\nextTick(function() use ($promise) {
- $promise->reject(new \OutOfBoundsException('foo'));
- });
- try {
- $promise->wait();
- $this->fail('We did not get the expected exception');
- } catch (\Exception $e) {
- $this->assertInstanceOf('OutOfBoundsException', $e);
- $this->assertEquals('foo', $e->getMessage());
- }
-
- }
-
- function testWaitRejectedScalar() {
-
- $promise = new Promise();
- Loop\nextTick(function() use ($promise) {
- $promise->reject('foo');
- });
- try {
- $promise->wait();
- $this->fail('We did not get the expected exception');
- } catch (\Exception $e) {
- $this->assertInstanceOf('Exception', $e);
- $this->assertEquals('foo', $e->getMessage());
- }
-
- }
-
- function testWaitRejectedNonScalar() {
-
- $promise = new Promise();
- Loop\nextTick(function() use ($promise) {
- $promise->reject([]);
- });
- try {
- $promise->wait();
- $this->fail('We did not get the expected exception');
- } catch (\Exception $e) {
- $this->assertInstanceOf('Exception', $e);
- $this->assertEquals('Promise was rejected with reason of type: array', $e->getMessage());
- }
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/event/tests/PromiseTest.php b/htdocs/includes/sabre/sabre/event/tests/PromiseTest.php
deleted file mode 100644
index 0029d898e53..00000000000
--- a/htdocs/includes/sabre/sabre/event/tests/PromiseTest.php
+++ /dev/null
@@ -1,386 +0,0 @@
-<?php
-
-namespace Sabre\Event;
-
-class PromiseTest extends \PHPUnit_Framework_TestCase {
-
- function testSuccess() {
-
- $finalValue = 0;
- $promise = new Promise();
- $promise->fulfill(1);
-
- $promise->then(function($value) use (&$finalValue) {
- $finalValue = $value + 2;
- });
- Loop\run();
-
- $this->assertEquals(3, $finalValue);
-
- }
-
- function testFail() {
-
- $finalValue = 0;
- $promise = new Promise();
- $promise->reject(1);
-
- $promise->then(null, function($value) use (&$finalValue) {
- $finalValue = $value + 2;
- });
- Loop\run();
-
- $this->assertEquals(3, $finalValue);
-
- }
-
- function testChain() {
-
- $finalValue = 0;
- $promise = new Promise();
- $promise->fulfill(1);
-
- $promise->then(function($value) use (&$finalValue) {
- $finalValue = $value + 2;
- return $finalValue;
- })->then(function($value) use (&$finalValue) {
- $finalValue = $value + 4;
- return $finalValue;
- });
- Loop\run();
-
- $this->assertEquals(7, $finalValue);
-
- }
- function testChainPromise() {
-
- $finalValue = 0;
- $promise = new Promise();
- $promise->fulfill(1);
-
- $subPromise = new Promise();
-
- $promise->then(function($value) use ($subPromise) {
- return $subPromise;
- })->then(function($value) use (&$finalValue) {
- $finalValue = $value + 4;
- return $finalValue;
- });
-
- $subPromise->fulfill(2);
- Loop\run();
-
- $this->assertEquals(6, $finalValue);
-
- }
-
- function testPendingResult() {
-
- $finalValue = 0;
- $promise = new Promise();
-
- $promise->then(function($value) use (&$finalValue) {
- $finalValue = $value + 2;
- });
-
- $promise->fulfill(4);
- Loop\run();
-
- $this->assertEquals(6, $finalValue);
-
- }
-
- function testPendingFail() {
-
- $finalValue = 0;
- $promise = new Promise();
-
- $promise->then(null, function($value) use (&$finalValue) {
- $finalValue = $value + 2;
- });
-
- $promise->reject(4);
- Loop\run();
-
- $this->assertEquals(6, $finalValue);
-
- }
-
- function testExecutorSuccess() {
-
- $promise = (new Promise(function($success, $fail) {
-
- $success('hi');
-
- }))->then(function($result) use (&$realResult) {
-
- $realResult = $result;
-
- });
- Loop\run();
-
- $this->assertEquals('hi', $realResult);
-
- }
-
- function testExecutorFail() {
-
- $promise = (new Promise(function($success, $fail) {
-
- $fail('hi');
-
- }))->then(function($result) use (&$realResult) {
-
- $realResult = 'incorrect';
-
- }, function($reason) use (&$realResult) {
-
- $realResult = $reason;
-
- });
- Loop\run();
-
- $this->assertEquals('hi', $realResult);
-
- }
-
- /**
- * @expectedException \Sabre\Event\PromiseAlreadyResolvedException
- */
- function testFulfillTwice() {
-
- $promise = new Promise();
- $promise->fulfill(1);
- $promise->fulfill(1);
-
- }
-
- /**
- * @expectedException \Sabre\Event\PromiseAlreadyResolvedException
- */
- function testRejectTwice() {
-
- $promise = new Promise();
- $promise->reject(1);
- $promise->reject(1);
-
- }
-
- function testFromFailureHandler() {
-
- $ok = 0;
- $promise = new Promise();
- $promise->otherwise(function($reason) {
-
- $this->assertEquals('foo', $reason);
- throw new \Exception('hi');
-
- })->then(function() use (&$ok) {
-
- $ok = -1;
-
- }, function() use (&$ok) {
-
- $ok = 1;
-
- });
-
- $this->assertEquals(0, $ok);
- $promise->reject('foo');
- Loop\run();
-
- $this->assertEquals(1, $ok);
-
- }
-
- function testAll() {
-
- $promise1 = new Promise();
- $promise2 = new Promise();
-
- $finalValue = 0;
- Promise::all([$promise1, $promise2])->then(function($value) use (&$finalValue) {
-
- $finalValue = $value;
-
- });
-
- $promise1->fulfill(1);
- Loop\run();
- $this->assertEquals(0, $finalValue);
-
- $promise2->fulfill(2);
- Loop\run();
- $this->assertEquals([1, 2], $finalValue);
-
- }
-
- function testAllReject() {
-
- $promise1 = new Promise();
- $promise2 = new Promise();
-
- $finalValue = 0;
- Promise::all([$promise1, $promise2])->then(
- function($value) use (&$finalValue) {
- $finalValue = 'foo';
- return 'test';
- },
- function($value) use (&$finalValue) {
- $finalValue = $value;
- }
- );
-
- $promise1->reject(1);
- Loop\run();
- $this->assertEquals(1, $finalValue);
- $promise2->reject(2);
- Loop\run();
- $this->assertEquals(1, $finalValue);
-
- }
-
- function testAllRejectThenResolve() {
-
- $promise1 = new Promise();
- $promise2 = new Promise();
-
- $finalValue = 0;
- Promise::all([$promise1, $promise2])->then(
- function($value) use (&$finalValue) {
- $finalValue = 'foo';
- return 'test';
- },
- function($value) use (&$finalValue) {
- $finalValue = $value;
- }
- );
-
- $promise1->reject(1);
- Loop\run();
- $this->assertEquals(1, $finalValue);
- $promise2->fulfill(2);
- Loop\run();
- $this->assertEquals(1, $finalValue);
-
- }
-
- function testRace() {
-
- $promise1 = new Promise();
- $promise2 = new Promise();
-
- $finalValue = 0;
- Promise\race([$promise1, $promise2])->then(
- function($value) use (&$finalValue) {
- $finalValue = $value;
- },
- function($value) use (&$finalValue) {
- $finalValue = $value;
- }
- );
-
- $promise1->fulfill(1);
- Loop\run();
- $this->assertEquals(1, $finalValue);
- $promise2->fulfill(2);
- Loop\run();
- $this->assertEquals(1, $finalValue);
-
- }
-
- function testRaceReject() {
-
- $promise1 = new Promise();
- $promise2 = new Promise();
-
- $finalValue = 0;
- Promise\race([$promise1, $promise2])->then(
- function($value) use (&$finalValue) {
- $finalValue = $value;
- },
- function($value) use (&$finalValue) {
- $finalValue = $value;
- }
- );
-
- $promise1->reject(1);
- Loop\run();
- $this->assertEquals(1, $finalValue);
- $promise2->reject(2);
- Loop\run();
- $this->assertEquals(1, $finalValue);
-
- }
-
- function testWaitResolve() {
-
- $promise = new Promise();
- Loop\nextTick(function() use ($promise) {
- $promise->fulfill(1);
- });
- $this->assertEquals(
- 1,
- $promise->wait()
- );
-
- }
-
- /**
- * @expectedException \LogicException
- */
- function testWaitWillNeverResolve() {
-
- $promise = new Promise();
- $promise->wait();
-
- }
-
- function testWaitRejectedException() {
-
- $promise = new Promise();
- Loop\nextTick(function() use ($promise) {
- $promise->reject(new \OutOfBoundsException('foo'));
- });
- try {
- $promise->wait();
- $this->fail('We did not get the expected exception');
- } catch (\Exception $e) {
- $this->assertInstanceOf('OutOfBoundsException', $e);
- $this->assertEquals('foo', $e->getMessage());
- }
-
- }
-
- function testWaitRejectedScalar() {
-
- $promise = new Promise();
- Loop\nextTick(function() use ($promise) {
- $promise->reject('foo');
- });
- try {
- $promise->wait();
- $this->fail('We did not get the expected exception');
- } catch (\Exception $e) {
- $this->assertInstanceOf('Exception', $e);
- $this->assertEquals('foo', $e->getMessage());
- }
-
- }
-
- function testWaitRejectedNonScalar() {
-
- $promise = new Promise();
- Loop\nextTick(function() use ($promise) {
- $promise->reject([]);
- });
- try {
- $promise->wait();
- $this->fail('We did not get the expected exception');
- } catch (\Exception $e) {
- $this->assertInstanceOf('Exception', $e);
- $this->assertEquals('Promise was rejected with reason of type: array', $e->getMessage());
- }
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/event/tests/benchmark/bench.php b/htdocs/includes/sabre/sabre/event/tests/benchmark/bench.php
deleted file mode 100644
index b1e6b1d4787..00000000000
--- a/htdocs/includes/sabre/sabre/event/tests/benchmark/bench.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-use Sabre\Event\EventEmitter;
-
-include __DIR__ . '/../../vendor/autoload.php';
-
-abstract class BenchMark {
-
- protected $startTime;
- protected $iterations = 10000;
- protected $totalTime;
-
- function setUp() {
-
- }
-
- abstract function test();
-
- function go() {
-
- $this->setUp();
- $this->startTime = microtime(true);
- $this->test();
- $this->totalTime = microtime(true) - $this->startTime;
- return $this->totalTime;
-
- }
-
-}
-
-class OneCallBack extends BenchMark {
-
- protected $emitter;
- protected $iterations = 100000;
-
- function setUp() {
-
- $this->emitter = new EventEmitter();
- $this->emitter->on('foo', function() {
- // NOOP
- });
-
- }
-
- function test() {
-
- for ($i = 0;$i < $this->iterations;$i++) {
- $this->emitter->emit('foo', []);
- }
-
- }
-
-}
-
-class ManyCallBacks extends BenchMark {
-
- protected $emitter;
-
- function setUp() {
-
- $this->emitter = new EventEmitter();
- for ($i = 0;$i < 100;$i++) {
- $this->emitter->on('foo', function() {
- // NOOP
- });
- }
-
- }
-
- function test() {
-
- for ($i = 0;$i < $this->iterations;$i++) {
- $this->emitter->emit('foo', []);
- }
-
- }
-
-}
-
-class ManyPrioritizedCallBacks extends BenchMark {
-
- protected $emitter;
-
- function setUp() {
-
- $this->emitter = new EventEmitter();
- for ($i = 0;$i < 100;$i++) {
- $this->emitter->on('foo', function() {
- }, 1000 - $i);
- }
-
- }
-
- function test() {
-
- for ($i = 0;$i < $this->iterations;$i++) {
- $this->emitter->emit('foo', []);
- }
-
- }
-
-}
-
-$tests = [
- 'OneCallBack',
- 'ManyCallBacks',
- 'ManyPrioritizedCallBacks',
-];
-
-foreach ($tests as $test) {
-
- $testObj = new $test();
- $result = $testObj->go();
- echo $test . " " . $result . "\n";
-
-}
diff --git a/htdocs/includes/sabre/sabre/http/tests/HTTP/Auth/AWSTest.php b/htdocs/includes/sabre/sabre/http/tests/HTTP/Auth/AWSTest.php
deleted file mode 100644
index 650761acae3..00000000000
--- a/htdocs/includes/sabre/sabre/http/tests/HTTP/Auth/AWSTest.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php
-
-namespace Sabre\HTTP\Auth;
-
-use Sabre\HTTP\Request;
-use Sabre\HTTP\Response;
-
-class AWSTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * @var Sabre\HTTP\Response
- */
- private $response;
-
- /**
- * @var Sabre\HTTP\Request
- */
- private $request;
-
- /**
- * @var Sabre\HTTP\Auth\AWS
- */
- private $auth;
-
- const REALM = 'SabreDAV unittest';
-
- function setUp() {
-
- $this->response = new Response();
- $this->request = new Request();
- $this->auth = new AWS(self::REALM, $this->request, $this->response);
-
- }
-
- function testNoHeader() {
-
- $this->request->setMethod('GET');
- $result = $this->auth->init();
-
- $this->assertFalse($result, 'No AWS Authorization header was supplied, so we should have gotten false');
- $this->assertEquals(AWS::ERR_NOAWSHEADER, $this->auth->errorCode);
-
- }
-
- function testIncorrectContentMD5() {
-
- $accessKey = 'accessKey';
- $secretKey = 'secretKey';
-
- $this->request->setMethod('GET');
- $this->request->setHeaders([
- 'Authorization' => "AWS $accessKey:sig",
- 'Content-MD5' => 'garbage',
- ]);
- $this->request->setUrl('/');
-
- $this->auth->init();
- $result = $this->auth->validate($secretKey);
-
- $this->assertFalse($result);
- $this->assertEquals(AWS::ERR_MD5CHECKSUMWRONG, $this->auth->errorCode);
-
- }
-
- function testNoDate() {
-
- $accessKey = 'accessKey';
- $secretKey = 'secretKey';
- $content = 'thisisthebody';
- $contentMD5 = base64_encode(md5($content, true));
-
- $this->request->setMethod('POST');
- $this->request->setHeaders([
- 'Authorization' => "AWS $accessKey:sig",
- 'Content-MD5' => $contentMD5,
- ]);
- $this->request->setUrl('/');
- $this->request->setBody($content);
-
- $this->auth->init();
- $result = $this->auth->validate($secretKey);
-
- $this->assertFalse($result);
- $this->assertEquals(AWS::ERR_INVALIDDATEFORMAT, $this->auth->errorCode);
-
- }
-
- function testFutureDate() {
-
- $accessKey = 'accessKey';
- $secretKey = 'secretKey';
- $content = 'thisisthebody';
- $contentMD5 = base64_encode(md5($content, true));
-
- $date = new \DateTime('@' . (time() + (60 * 20)));
- $date->setTimeZone(new \DateTimeZone('GMT'));
- $date = $date->format('D, d M Y H:i:s \\G\\M\\T');
-
- $this->request->setMethod('POST');
- $this->request->setHeaders([
- 'Authorization' => "AWS $accessKey:sig",
- 'Content-MD5' => $contentMD5,
- 'Date' => $date,
- ]);
-
- $this->request->setBody($content);
-
- $this->auth->init();
- $result = $this->auth->validate($secretKey);
-
- $this->assertFalse($result);
- $this->assertEquals(AWS::ERR_REQUESTTIMESKEWED, $this->auth->errorCode);
-
- }
-
- function testPastDate() {
-
- $accessKey = 'accessKey';
- $secretKey = 'secretKey';
- $content = 'thisisthebody';
- $contentMD5 = base64_encode(md5($content, true));
-
- $date = new \DateTime('@' . (time() - (60 * 20)));
- $date->setTimeZone(new \DateTimeZone('GMT'));
- $date = $date->format('D, d M Y H:i:s \\G\\M\\T');
-
- $this->request->setMethod('POST');
- $this->request->setHeaders([
- 'Authorization' => "AWS $accessKey:sig",
- 'Content-MD5' => $contentMD5,
- 'Date' => $date,
- ]);
-
- $this->request->setBody($content);
-
- $this->auth->init();
- $result = $this->auth->validate($secretKey);
-
- $this->assertFalse($result);
- $this->assertEquals(AWS::ERR_REQUESTTIMESKEWED, $this->auth->errorCode);
-
- }
-
- function testIncorrectSignature() {
-
- $accessKey = 'accessKey';
- $secretKey = 'secretKey';
- $content = 'thisisthebody';
-
- $contentMD5 = base64_encode(md5($content, true));
-
- $date = new \DateTime('now');
- $date->setTimeZone(new \DateTimeZone('GMT'));
- $date = $date->format('D, d M Y H:i:s \\G\\M\\T');
-
- $this->request->setUrl('/');
- $this->request->setMethod('POST');
- $this->request->setHeaders([
- 'Authorization' => "AWS $accessKey:sig",
- 'Content-MD5' => $contentMD5,
- 'X-amz-date' => $date,
- ]);
- $this->request->setBody($content);
-
- $this->auth->init();
- $result = $this->auth->validate($secretKey);
-
- $this->assertFalse($result);
- $this->assertEquals(AWS::ERR_INVALIDSIGNATURE, $this->auth->errorCode);
-
- }
-
- function testValidRequest() {
-
- $accessKey = 'accessKey';
- $secretKey = 'secretKey';
- $content = 'thisisthebody';
- $contentMD5 = base64_encode(md5($content, true));
-
- $date = new \DateTime('now');
- $date->setTimeZone(new \DateTimeZone('GMT'));
- $date = $date->format('D, d M Y H:i:s \\G\\M\\T');
-
-
- $sig = base64_encode($this->hmacsha1($secretKey,
- "POST\n$contentMD5\n\n$date\nx-amz-date:$date\n/evert"
- ));
-
- $this->request->setUrl('/evert');
- $this->request->setMethod('POST');
- $this->request->setHeaders([
- 'Authorization' => "AWS $accessKey:$sig",
- 'Content-MD5' => $contentMD5,
- 'X-amz-date' => $date,
- ]);
-
- $this->request->setBody($content);
-
- $this->auth->init();
- $result = $this->auth->validate($secretKey);
-
- $this->assertTrue($result, 'Signature did not validate, got errorcode ' . $this->auth->errorCode);
- $this->assertEquals($accessKey, $this->auth->getAccessKey());
-
- }
-
- function test401() {
-
- $this->auth->requireLogin();
- $test = preg_match('/^AWS$/', $this->response->getHeader('WWW-Authenticate'), $matches);
- $this->assertTrue($test == true, 'The WWW-Authenticate response didn\'t match our pattern');
-
- }
-
- /**
- * Generates an HMAC-SHA1 signature
- *
- * @param string $key
- * @param string $message
- * @return string
- */
- private function hmacsha1($key, $message) {
-
- $blocksize = 64;
- if (strlen($key) > $blocksize)
- $key = pack('H*', sha1($key));
- $key = str_pad($key, $blocksize, chr(0x00));
- $ipad = str_repeat(chr(0x36), $blocksize);
- $opad = str_repeat(chr(0x5c), $blocksize);
- $hmac = pack('H*', sha1(($key ^ $opad) . pack('H*', sha1(($key ^ $ipad) . $message))));
- return $hmac;
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/http/tests/HTTP/Auth/BasicTest.php b/htdocs/includes/sabre/sabre/http/tests/HTTP/Auth/BasicTest.php
deleted file mode 100644
index 7c25e59de1b..00000000000
--- a/htdocs/includes/sabre/sabre/http/tests/HTTP/Auth/BasicTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Sabre\HTTP\Auth;
-
-use Sabre\HTTP\Request;
-use Sabre\HTTP\Response;
-
-class BasicTest extends \PHPUnit_Framework_TestCase {
-
- function testGetCredentials() {
-
- $request = new Request('GET', '/', [
- 'Authorization' => 'Basic ' . base64_encode('user:pass:bla')
- ]);
-
- $basic = new Basic('Dagger', $request, new Response());
-
- $this->assertEquals([
- 'user',
- 'pass:bla',
- ], $basic->getCredentials());
-
- }
-
- function testGetInvalidCredentialsColonMissing() {
-
- $request = new Request('GET', '/', [
- 'Authorization' => 'Basic ' . base64_encode('userpass')
- ]);
-
- $basic = new Basic('Dagger', $request, new Response());
-
- $this->assertNull($basic->getCredentials());
-
- }
-
- function testGetCredentialsNoheader() {
-
- $request = new Request('GET', '/', []);
- $basic = new Basic('Dagger', $request, new Response());
-
- $this->assertNull($basic->getCredentials());
-
- }
-
- function testGetCredentialsNotBasic() {
-
- $request = new Request('GET', '/', [
- 'Authorization' => 'QBasic ' . base64_encode('user:pass:bla')
- ]);
- $basic = new Basic('Dagger', $request, new Response());
-
- $this->assertNull($basic->getCredentials());
-
- }
-
- function testRequireLogin() {
-
- $response = new Response();
- $basic = new Basic('Dagger', new Request(), $response);
-
- $basic->requireLogin();
-
- $this->assertEquals('Basic realm="Dagger"', $response->getHeader('WWW-Authenticate'));
- $this->assertEquals(401, $response->getStatus());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/http/tests/HTTP/Auth/BearerTest.php b/htdocs/includes/sabre/sabre/http/tests/HTTP/Auth/BearerTest.php
deleted file mode 100644
index ee2e9e0bd72..00000000000
--- a/htdocs/includes/sabre/sabre/http/tests/HTTP/Auth/BearerTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-namespace Sabre\HTTP\Auth;
-
-use Sabre\HTTP\Request;
-use Sabre\HTTP\Response;
-
-class BearerTest extends \PHPUnit_Framework_TestCase {
-
- function testGetToken() {
-
- $request = new Request('GET', '/', [
- 'Authorization' => 'Bearer 12345'
- ]);
-
- $bearer = new Bearer('Dagger', $request, new Response());
-
- $this->assertEquals(
- '12345',
- $bearer->getToken()
- );
-
- }
-
- function testGetCredentialsNoheader() {
-
- $request = new Request('GET', '/', []);
- $bearer = new Bearer('Dagger', $request, new Response());
-
- $this->assertNull($bearer->getToken());
-
- }
-
- function testGetCredentialsNotBearer() {
-
- $request = new Request('GET', '/', [
- 'Authorization' => 'QBearer 12345'
- ]);
- $bearer = new Bearer('Dagger', $request, new Response());
-
- $this->assertNull($bearer->getToken());
-
- }
-
- function testRequireLogin() {
-
- $response = new Response();
- $bearer = new Bearer('Dagger', new Request(), $response);
-
- $bearer->requireLogin();
-
- $this->assertEquals('Bearer realm="Dagger"', $response->getHeader('WWW-Authenticate'));
- $this->assertEquals(401, $response->getStatus());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/http/tests/HTTP/Auth/DigestTest.php b/htdocs/includes/sabre/sabre/http/tests/HTTP/Auth/DigestTest.php
deleted file mode 100644
index ffb69c76d6d..00000000000
--- a/htdocs/includes/sabre/sabre/http/tests/HTTP/Auth/DigestTest.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-
-namespace Sabre\HTTP\Auth;
-
-use Sabre\HTTP\Request;
-use Sabre\HTTP\Response;
-
-class DigestTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * @var Sabre\HTTP\Response
- */
- private $response;
-
- /**
- * request
- *
- * @var Sabre\HTTP\Request
- */
- private $request;
-
- /**
- * @var Sabre\HTTP\Auth\Digest
- */
- private $auth;
-
- const REALM = 'SabreDAV unittest';
-
- function setUp() {
-
- $this->response = new Response();
- $this->request = new Request();
- $this->auth = new Digest(self::REALM, $this->request, $this->response);
-
-
- }
-
- function testDigest() {
-
- list($nonce, $opaque) = $this->getServerTokens();
-
- $username = 'admin';
- $password = 12345;
- $nc = '00002';
- $cnonce = uniqid();
-
- $digestHash = md5(
- md5($username . ':' . self::REALM . ':' . $password) . ':' .
- $nonce . ':' .
- $nc . ':' .
- $cnonce . ':' .
- 'auth:' .
- md5('GET' . ':' . '/')
- );
-
- $this->request->setMethod('GET');
- $this->request->setHeader('Authorization', 'Digest username="' . $username . '", realm="' . self::REALM . '", nonce="' . $nonce . '", uri="/", response="' . $digestHash . '", opaque="' . $opaque . '", qop=auth,nc=' . $nc . ',cnonce="' . $cnonce . '"');
-
- $this->auth->init();
-
- $this->assertEquals($username, $this->auth->getUsername());
- $this->assertEquals(self::REALM, $this->auth->getRealm());
- $this->assertTrue($this->auth->validateA1(md5($username . ':' . self::REALM . ':' . $password)), 'Authentication is deemed invalid through validateA1');
- $this->assertTrue($this->auth->validatePassword($password), 'Authentication is deemed invalid through validatePassword');
-
- }
-
- function testInvalidDigest() {
-
- list($nonce, $opaque) = $this->getServerTokens();
-
- $username = 'admin';
- $password = 12345;
- $nc = '00002';
- $cnonce = uniqid();
-
- $digestHash = md5(
- md5($username . ':' . self::REALM . ':' . $password) . ':' .
- $nonce . ':' .
- $nc . ':' .
- $cnonce . ':' .
- 'auth:' .
- md5('GET' . ':' . '/')
- );
-
- $this->request->setMethod('GET');
- $this->request->setHeader('Authorization', 'Digest username="' . $username . '", realm="' . self::REALM . '", nonce="' . $nonce . '", uri="/", response="' . $digestHash . '", opaque="' . $opaque . '", qop=auth,nc=' . $nc . ',cnonce="' . $cnonce . '"');
-
- $this->auth->init();
-
- $this->assertFalse($this->auth->validateA1(md5($username . ':' . self::REALM . ':' . ($password . 'randomness'))), 'Authentication is deemed invalid through validateA1');
-
- }
-
- function testInvalidDigest2() {
-
- $this->request->setMethod('GET');
- $this->request->setHeader('Authorization', 'basic blablabla');
-
- $this->auth->init();
- $this->assertFalse($this->auth->validateA1(md5('user:realm:password')));
-
- }
-
-
- function testDigestAuthInt() {
-
- $this->auth->setQOP(Digest::QOP_AUTHINT);
- list($nonce, $opaque) = $this->getServerTokens(Digest::QOP_AUTHINT);
-
- $username = 'admin';
- $password = 12345;
- $nc = '00003';
- $cnonce = uniqid();
-
- $digestHash = md5(
- md5($username . ':' . self::REALM . ':' . $password) . ':' .
- $nonce . ':' .
- $nc . ':' .
- $cnonce . ':' .
- 'auth-int:' .
- md5('POST' . ':' . '/' . ':' . md5('body'))
- );
-
- $this->request->setMethod('POST');
- $this->request->setHeader('Authorization', 'Digest username="' . $username . '", realm="' . self::REALM . '", nonce="' . $nonce . '", uri="/", response="' . $digestHash . '", opaque="' . $opaque . '", qop=auth-int,nc=' . $nc . ',cnonce="' . $cnonce . '"');
- $this->request->setBody('body');
-
- $this->auth->init();
-
- $this->assertTrue($this->auth->validateA1(md5($username . ':' . self::REALM . ':' . $password)), 'Authentication is deemed invalid through validateA1');
-
- }
-
- function testDigestAuthBoth() {
-
- $this->auth->setQOP(Digest::QOP_AUTHINT | Digest::QOP_AUTH);
- list($nonce, $opaque) = $this->getServerTokens(Digest::QOP_AUTHINT | Digest::QOP_AUTH);
-
- $username = 'admin';
- $password = 12345;
- $nc = '00003';
- $cnonce = uniqid();
-
- $digestHash = md5(
- md5($username . ':' . self::REALM . ':' . $password) . ':' .
- $nonce . ':' .
- $nc . ':' .
- $cnonce . ':' .
- 'auth-int:' .
- md5('POST' . ':' . '/' . ':' . md5('body'))
- );
-
- $this->request->setMethod('POST');
- $this->request->setHeader('Authorization', 'Digest username="' . $username . '", realm="' . self::REALM . '", nonce="' . $nonce . '", uri="/", response="' . $digestHash . '", opaque="' . $opaque . '", qop=auth-int,nc=' . $nc . ',cnonce="' . $cnonce . '"');
- $this->request->setBody('body');
-
- $this->auth->init();
-
- $this->assertTrue($this->auth->validateA1(md5($username . ':' . self::REALM . ':' . $password)), 'Authentication is deemed invalid through validateA1');
-
- }
-
-
- private function getServerTokens($qop = Digest::QOP_AUTH) {
-
- $this->auth->requireLogin();
-
- switch ($qop) {
- case Digest::QOP_AUTH : $qopstr = 'auth'; break;
- case Digest::QOP_AUTHINT : $qopstr = 'auth-int'; break;
- default : $qopstr = 'auth,auth-int'; break;
- }
-
- $test = preg_match('/Digest realm="' . self::REALM . '",qop="' . $qopstr . '",nonce="([0-9a-f]*)",opaque="([0-9a-f]*)"/',
- $this->response->getHeader('WWW-Authenticate'), $matches);
-
- $this->assertTrue($test == true, 'The WWW-Authenticate response didn\'t match our pattern. We received: ' . $this->response->getHeader('WWW-Authenticate'));
-
- $nonce = $matches[1];
- $opaque = $matches[2];
-
- // Reset our environment
- $this->setUp();
- $this->auth->setQOP($qop);
-
- return [$nonce,$opaque];
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/http/tests/HTTP/ClientTest.php b/htdocs/includes/sabre/sabre/http/tests/HTTP/ClientTest.php
deleted file mode 100644
index ea25907df2d..00000000000
--- a/htdocs/includes/sabre/sabre/http/tests/HTTP/ClientTest.php
+++ /dev/null
@@ -1,474 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-class ClientTest extends \PHPUnit_Framework_TestCase {
-
- function testCreateCurlSettingsArrayGET() {
-
- $client = new ClientMock();
- $client->addCurlSetting(CURLOPT_POSTREDIR, 0);
-
- $request = new Request('GET', 'http://example.org/', ['X-Foo' => 'bar']);
-
- $settings = [
- CURLOPT_RETURNTRANSFER => true,
- CURLOPT_HEADER => true,
- CURLOPT_POSTREDIR => 0,
- CURLOPT_HTTPHEADER => ['X-Foo: bar'],
- CURLOPT_NOBODY => false,
- CURLOPT_URL => 'http://example.org/',
- CURLOPT_CUSTOMREQUEST => 'GET',
- CURLOPT_POSTFIELDS => '',
- CURLOPT_PUT => false,
- CURLOPT_USERAGENT => 'sabre-http/' . Version::VERSION . ' (http://sabre.io/)',
- ];
-
- // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
- // at least if this unit test fails in the future we know it is :)
- if (defined('HHVM_VERSION') === false) {
- $settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
- $settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
- }
-
-
- $this->assertEquals($settings, $client->createCurlSettingsArray($request));
-
- }
-
- function testCreateCurlSettingsArrayHEAD() {
-
- $client = new ClientMock();
- $request = new Request('HEAD', 'http://example.org/', ['X-Foo' => 'bar']);
-
-
- $settings = [
- CURLOPT_RETURNTRANSFER => true,
- CURLOPT_HEADER => true,
- CURLOPT_NOBODY => true,
- CURLOPT_CUSTOMREQUEST => 'HEAD',
- CURLOPT_HTTPHEADER => ['X-Foo: bar'],
- CURLOPT_URL => 'http://example.org/',
- CURLOPT_POSTFIELDS => '',
- CURLOPT_PUT => false,
- CURLOPT_USERAGENT => 'sabre-http/' . Version::VERSION . ' (http://sabre.io/)',
- ];
-
- // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
- // at least if this unit test fails in the future we know it is :)
- if (defined('HHVM_VERSION') === false) {
- $settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
- $settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
- }
-
- $this->assertEquals($settings, $client->createCurlSettingsArray($request));
-
- }
-
- function testCreateCurlSettingsArrayGETAfterHEAD() {
-
- $client = new ClientMock();
- $request = new Request('HEAD', 'http://example.org/', ['X-Foo' => 'bar']);
-
- // Parsing the settings for this method, and discarding the result.
- // This will cause the client to automatically persist previous
- // settings and will help us detect problems.
- $client->createCurlSettingsArray($request);
-
- // This is the real request.
- $request = new Request('GET', 'http://example.org/', ['X-Foo' => 'bar']);
-
- $settings = [
- CURLOPT_CUSTOMREQUEST => 'GET',
- CURLOPT_RETURNTRANSFER => true,
- CURLOPT_HEADER => true,
- CURLOPT_HTTPHEADER => ['X-Foo: bar'],
- CURLOPT_NOBODY => false,
- CURLOPT_URL => 'http://example.org/',
- CURLOPT_POSTFIELDS => '',
- CURLOPT_PUT => false,
- CURLOPT_USERAGENT => 'sabre-http/' . Version::VERSION . ' (http://sabre.io/)',
- ];
-
- // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
- // at least if this unit test fails in the future we know it is :)
- if (defined('HHVM_VERSION') === false) {
- $settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
- $settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
- }
-
- $this->assertEquals($settings, $client->createCurlSettingsArray($request));
-
- }
-
- function testCreateCurlSettingsArrayPUTStream() {
-
- $client = new ClientMock();
-
- $h = fopen('php://memory', 'r+');
- fwrite($h, 'booh');
- $request = new Request('PUT', 'http://example.org/', ['X-Foo' => 'bar'], $h);
-
- $settings = [
- CURLOPT_RETURNTRANSFER => true,
- CURLOPT_HEADER => true,
- CURLOPT_PUT => true,
- CURLOPT_INFILE => $h,
- CURLOPT_NOBODY => false,
- CURLOPT_CUSTOMREQUEST => 'PUT',
- CURLOPT_HTTPHEADER => ['X-Foo: bar'],
- CURLOPT_URL => 'http://example.org/',
- CURLOPT_USERAGENT => 'sabre-http/' . Version::VERSION . ' (http://sabre.io/)',
- ];
-
- // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
- // at least if this unit test fails in the future we know it is :)
- if (defined('HHVM_VERSION') === false) {
- $settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
- $settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
- }
-
- $this->assertEquals($settings, $client->createCurlSettingsArray($request));
-
- }
-
- function testCreateCurlSettingsArrayPUTString() {
-
- $client = new ClientMock();
- $request = new Request('PUT', 'http://example.org/', ['X-Foo' => 'bar'], 'boo');
-
- $settings = [
- CURLOPT_RETURNTRANSFER => true,
- CURLOPT_HEADER => true,
- CURLOPT_NOBODY => false,
- CURLOPT_POSTFIELDS => 'boo',
- CURLOPT_CUSTOMREQUEST => 'PUT',
- CURLOPT_HTTPHEADER => ['X-Foo: bar'],
- CURLOPT_URL => 'http://example.org/',
- CURLOPT_USERAGENT => 'sabre-http/' . Version::VERSION . ' (http://sabre.io/)',
- ];
-
- // FIXME: CURLOPT_PROTOCOLS and CURLOPT_REDIR_PROTOCOLS are currently unsupported by HHVM
- // at least if this unit test fails in the future we know it is :)
- if (defined('HHVM_VERSION') === false) {
- $settings[CURLOPT_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
- $settings[CURLOPT_REDIR_PROTOCOLS] = CURLPROTO_HTTP | CURLPROTO_HTTPS;
- }
-
- $this->assertEquals($settings, $client->createCurlSettingsArray($request));
-
- }
-
- function testSend() {
-
- $client = new ClientMock();
- $request = new Request('GET', 'http://example.org/');
-
- $client->on('doRequest', function($request, &$response) {
- $response = new Response(200);
- });
-
- $response = $client->send($request);
-
- $this->assertEquals(200, $response->getStatus());
-
- }
-
- function testSendClientError() {
-
- $client = new ClientMock();
- $request = new Request('GET', 'http://example.org/');
-
- $client->on('doRequest', function($request, &$response) {
- throw new ClientException('aaah', 1);
- });
- $called = false;
- $client->on('exception', function() use (&$called) {
- $called = true;
- });
-
- try {
- $client->send($request);
- $this->fail('send() should have thrown an exception');
- } catch (ClientException $e) {
-
- }
- $this->assertTrue($called);
-
- }
-
- function testSendHttpError() {
-
- $client = new ClientMock();
- $request = new Request('GET', 'http://example.org/');
-
- $client->on('doRequest', function($request, &$response) {
- $response = new Response(404);
- });
- $called = 0;
- $client->on('error', function() use (&$called) {
- $called++;
- });
- $client->on('error:404', function() use (&$called) {
- $called++;
- });
-
- $client->send($request);
- $this->assertEquals(2, $called);
-
- }
-
- function testSendRetry() {
-
- $client = new ClientMock();
- $request = new Request('GET', 'http://example.org/');
-
- $called = 0;
- $client->on('doRequest', function($request, &$response) use (&$called) {
- $called++;
- if ($called < 3) {
- $response = new Response(404);
- } else {
- $response = new Response(200);
- }
- });
-
- $errorCalled = 0;
- $client->on('error', function($request, $response, &$retry, $retryCount) use (&$errorCalled) {
-
- $errorCalled++;
- $retry = true;
-
- });
-
- $response = $client->send($request);
- $this->assertEquals(3, $called);
- $this->assertEquals(2, $errorCalled);
- $this->assertEquals(200, $response->getStatus());
-
- }
-
- function testHttpErrorException() {
-
- $client = new ClientMock();
- $client->setThrowExceptions(true);
- $request = new Request('GET', 'http://example.org/');
-
- $client->on('doRequest', function($request, &$response) {
- $response = new Response(404);
- });
-
- try {
- $client->send($request);
- $this->fail('An exception should have been thrown');
- } catch (ClientHttpException $e) {
- $this->assertEquals(404, $e->getHttpStatus());
- $this->assertInstanceOf('Sabre\HTTP\Response', $e->getResponse());
- }
-
- }
-
- function testParseCurlResult() {
-
- $client = new ClientMock();
- $client->on('curlStuff', function(&$return) {
-
- $return = [
- [
- 'header_size' => 33,
- 'http_code' => 200,
- ],
- 0,
- '',
- ];
-
- });
-
- $body = "HTTP/1.1 200 OK\r\nHeader1:Val1\r\n\r\nFoo";
- $result = $client->parseCurlResult($body, 'foobar');
-
- $this->assertEquals(Client::STATUS_SUCCESS, $result['status']);
- $this->assertEquals(200, $result['http_code']);
- $this->assertEquals(200, $result['response']->getStatus());
- $this->assertEquals(['Header1' => ['Val1']], $result['response']->getHeaders());
- $this->assertEquals('Foo', $result['response']->getBodyAsString());
-
- }
-
- function testParseCurlError() {
-
- $client = new ClientMock();
- $client->on('curlStuff', function(&$return) {
-
- $return = [
- [],
- 1,
- 'Curl error',
- ];
-
- });
-
- $body = "HTTP/1.1 200 OK\r\nHeader1:Val1\r\n\r\nFoo";
- $result = $client->parseCurlResult($body, 'foobar');
-
- $this->assertEquals(Client::STATUS_CURLERROR, $result['status']);
- $this->assertEquals(1, $result['curl_errno']);
- $this->assertEquals('Curl error', $result['curl_errmsg']);
-
- }
-
- function testDoRequest() {
-
- $client = new ClientMock();
- $request = new Request('GET', 'http://example.org/');
- $client->on('curlExec', function(&$return) {
-
- $return = "HTTP/1.1 200 OK\r\nHeader1:Val1\r\n\r\nFoo";
-
- });
- $client->on('curlStuff', function(&$return) {
-
- $return = [
- [
- 'header_size' => 33,
- 'http_code' => 200,
- ],
- 0,
- '',
- ];
-
- });
- $response = $client->doRequest($request);
- $this->assertEquals(200, $response->getStatus());
- $this->assertEquals(['Header1' => ['Val1']], $response->getHeaders());
- $this->assertEquals('Foo', $response->getBodyAsString());
-
- }
-
- function testDoRequestCurlError() {
-
- $client = new ClientMock();
- $request = new Request('GET', 'http://example.org/');
- $client->on('curlExec', function(&$return) {
-
- $return = "";
-
- });
- $client->on('curlStuff', function(&$return) {
-
- $return = [
- [],
- 1,
- 'Curl error',
- ];
-
- });
-
- try {
- $response = $client->doRequest($request);
- $this->fail('This should have thrown an exception');
- } catch (ClientException $e) {
- $this->assertEquals(1, $e->getCode());
- $this->assertEquals('Curl error', $e->getMessage());
- }
-
- }
-
-}
-
-class ClientMock extends Client {
-
- protected $persistedSettings = [];
-
- /**
- * Making this method public.
- *
- * We are also going to persist all settings this method generates. While
- * the underlying object doesn't behave exactly the same, it helps us
- * simulate what curl does internally, and helps us identify problems with
- * settings that are set by _some_ methods and not correctly reset by other
- * methods after subsequent use.
- * forces
- */
- function createCurlSettingsArray(RequestInterface $request) {
-
- $settings = parent::createCurlSettingsArray($request);
- $settings = $settings + $this->persistedSettings;
- $this->persistedSettings = $settings;
- return $settings;
-
- }
- /**
- * Making this method public.
- */
- function parseCurlResult($response, $curlHandle) {
-
- return parent::parseCurlResult($response, $curlHandle);
-
- }
-
- /**
- * This method is responsible for performing a single request.
- *
- * @param RequestInterface $request
- * @return ResponseInterface
- */
- function doRequest(RequestInterface $request) {
-
- $response = null;
- $this->emit('doRequest', [$request, &$response]);
-
- // If nothing modified $response, we're using the default behavior.
- if (is_null($response)) {
- return parent::doRequest($request);
- } else {
- return $response;
- }
-
- }
-
- /**
- * Returns a bunch of information about a curl request.
- *
- * This method exists so it can easily be overridden and mocked.
- *
- * @param resource $curlHandle
- * @return array
- */
- protected function curlStuff($curlHandle) {
-
- $return = null;
- $this->emit('curlStuff', [&$return]);
-
- // If nothing modified $return, we're using the default behavior.
- if (is_null($return)) {
- return parent::curlStuff($curlHandle);
- } else {
- return $return;
- }
-
- }
-
- /**
- * Calls curl_exec
- *
- * This method exists so it can easily be overridden and mocked.
- *
- * @param resource $curlHandle
- * @return string
- */
- protected function curlExec($curlHandle) {
-
- $return = null;
- $this->emit('curlExec', [&$return]);
-
- // If nothing modified $return, we're using the default behavior.
- if (is_null($return)) {
- return parent::curlExec($curlHandle);
- } else {
- return $return;
- }
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/http/tests/HTTP/FunctionsTest.php b/htdocs/includes/sabre/sabre/http/tests/HTTP/FunctionsTest.php
deleted file mode 100644
index a107d1f007a..00000000000
--- a/htdocs/includes/sabre/sabre/http/tests/HTTP/FunctionsTest.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-class FunctionsTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * @dataProvider getHeaderValuesData
- */
- function testGetHeaderValues($input, $output) {
-
- $this->assertEquals(
- $output,
- getHeaderValues($input)
- );
-
- }
-
- function getHeaderValuesData() {
-
- return [
- [
- "a",
- ["a"]
- ],
- [
- "a,b",
- ["a", "b"]
- ],
- [
- "a, b",
- ["a", "b"]
- ],
- [
- ["a, b"],
- ["a", "b"]
- ],
- [
- ["a, b", "c", "d,e"],
- ["a", "b", "c", "d", "e"]
- ],
- ];
-
- }
-
- /**
- * @dataProvider preferData
- */
- function testPrefer($input, $output) {
-
- $this->assertEquals(
- $output,
- parsePrefer($input)
- );
-
- }
-
- function preferData() {
-
- return [
- [
- 'foo; bar',
- ['foo' => true]
- ],
- [
- 'foo; bar=""',
- ['foo' => true]
- ],
- [
- 'foo=""; bar',
- ['foo' => true]
- ],
- [
- 'FOO',
- ['foo' => true]
- ],
- [
- 'respond-async',
- ['respond-async' => true]
- ],
- [
-
- ['respond-async, wait=100', 'handling=lenient'],
- ['respond-async' => true, 'wait' => 100, 'handling' => 'lenient']
- ],
- [
-
- ['respond-async, wait=100, handling=lenient'],
- ['respond-async' => true, 'wait' => 100, 'handling' => 'lenient']
- ],
- // Old values
- [
-
- 'return-asynch, return-representation',
- ['respond-async' => true, 'return' => 'representation'],
- ],
- [
-
- 'return-minimal',
- ['return' => 'minimal'],
- ],
- [
-
- 'strict',
- ['handling' => 'strict'],
- ],
- [
-
- 'lenient',
- ['handling' => 'lenient'],
- ],
- // Invalid token
- [
- ['foo=%bar%'],
- [],
- ]
- ];
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/http/tests/HTTP/MessageDecoratorTest.php b/htdocs/includes/sabre/sabre/http/tests/HTTP/MessageDecoratorTest.php
deleted file mode 100644
index a4052c60c0c..00000000000
--- a/htdocs/includes/sabre/sabre/http/tests/HTTP/MessageDecoratorTest.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-class MessageDecoratorTest extends \PHPUnit_Framework_TestCase {
-
- protected $inner;
- protected $outer;
-
- function setUp() {
-
- $this->inner = new Request();
- $this->outer = new RequestDecorator($this->inner);
-
- }
-
- function testBody() {
-
- $this->outer->setBody('foo');
- $this->assertEquals('foo', stream_get_contents($this->inner->getBodyAsStream()));
- $this->assertEquals('foo', stream_get_contents($this->outer->getBodyAsStream()));
- $this->assertEquals('foo', $this->inner->getBodyAsString());
- $this->assertEquals('foo', $this->outer->getBodyAsString());
- $this->assertEquals('foo', $this->inner->getBody());
- $this->assertEquals('foo', $this->outer->getBody());
-
- }
-
- function testHeaders() {
-
- $this->outer->setHeaders([
- 'a' => 'b',
- ]);
-
- $this->assertEquals(['a' => ['b']], $this->inner->getHeaders());
- $this->assertEquals(['a' => ['b']], $this->outer->getHeaders());
-
- $this->outer->setHeaders([
- 'c' => 'd',
- ]);
-
- $this->assertEquals(['a' => ['b'], 'c' => ['d']], $this->inner->getHeaders());
- $this->assertEquals(['a' => ['b'], 'c' => ['d']], $this->outer->getHeaders());
-
- $this->outer->addHeaders([
- 'e' => 'f',
- ]);
-
- $this->assertEquals(['a' => ['b'], 'c' => ['d'], 'e' => ['f']], $this->inner->getHeaders());
- $this->assertEquals(['a' => ['b'], 'c' => ['d'], 'e' => ['f']], $this->outer->getHeaders());
- }
-
- function testHeader() {
-
- $this->assertFalse($this->outer->hasHeader('a'));
- $this->assertFalse($this->inner->hasHeader('a'));
- $this->outer->setHeader('a', 'c');
- $this->assertTrue($this->outer->hasHeader('a'));
- $this->assertTrue($this->inner->hasHeader('a'));
-
- $this->assertEquals('c', $this->inner->getHeader('A'));
- $this->assertEquals('c', $this->outer->getHeader('A'));
-
- $this->outer->addHeader('A', 'd');
-
- $this->assertEquals(
- ['c', 'd'],
- $this->inner->getHeaderAsArray('A')
- );
- $this->assertEquals(
- ['c', 'd'],
- $this->outer->getHeaderAsArray('A')
- );
-
- $success = $this->outer->removeHeader('a');
-
- $this->assertTrue($success);
- $this->assertNull($this->inner->getHeader('A'));
- $this->assertNull($this->outer->getHeader('A'));
-
- $this->assertFalse($this->outer->removeHeader('i-dont-exist'));
- }
-
- function testHttpVersion() {
-
- $this->outer->setHttpVersion('1.0');
-
- $this->assertEquals('1.0', $this->inner->getHttpVersion());
- $this->assertEquals('1.0', $this->outer->getHttpVersion());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/http/tests/HTTP/MessageTest.php b/htdocs/includes/sabre/sabre/http/tests/HTTP/MessageTest.php
deleted file mode 100644
index cb5aadc416c..00000000000
--- a/htdocs/includes/sabre/sabre/http/tests/HTTP/MessageTest.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-class MessageTest extends \PHPUnit_Framework_TestCase {
-
- function testConstruct() {
-
- $message = new MessageMock();
- $this->assertInstanceOf('Sabre\HTTP\Message', $message);
-
- }
-
- function testStreamBody() {
-
- $body = 'foo';
- $h = fopen('php://memory', 'r+');
- fwrite($h, $body);
- rewind($h);
-
- $message = new MessageMock();
- $message->setBody($h);
-
- $this->assertEquals($body, $message->getBodyAsString());
- rewind($h);
- $this->assertEquals($body, stream_get_contents($message->getBodyAsStream()));
- rewind($h);
- $this->assertEquals($body, stream_get_contents($message->getBody()));
-
- }
-
- function testStringBody() {
-
- $body = 'foo';
-
- $message = new MessageMock();
- $message->setBody($body);
-
- $this->assertEquals($body, $message->getBodyAsString());
- $this->assertEquals($body, stream_get_contents($message->getBodyAsStream()));
- $this->assertEquals($body, $message->getBody());
-
- }
-
- /**
- * It's possible that streams contains more data than the Content-Length.
- *
- * The request object should make sure to never emit more than
- * Content-Length, if Content-Length is set.
- *
- * This is in particular useful when respoding to range requests with
- * streams that represent files on the filesystem, as it's possible to just
- * seek the stream to a certain point, set the content-length and let the
- * request object do the rest.
- */
- function testLongStreamToStringBody() {
-
- $body = fopen('php://memory', 'r+');
- fwrite($body, 'abcdefg');
- fseek($body, 2);
-
- $message = new MessageMock();
- $message->setBody($body);
- $message->setHeader('Content-Length', '4');
-
- $this->assertEquals(
- 'cdef',
- $message->getBodyAsString()
- );
-
- }
-
- /**
- * Some clients include a content-length header, but the header is empty.
- * This is definitely broken behavior, but we should support it.
- */
- function testEmptyContentLengthHeader() {
-
- $body = fopen('php://memory', 'r+');
- fwrite($body, 'abcdefg');
- fseek($body, 2);
-
- $message = new MessageMock();
- $message->setBody($body);
- $message->setHeader('Content-Length', '');
-
- $this->assertEquals(
- 'cdefg',
- $message->getBodyAsString()
- );
-
- }
-
-
- function testGetEmptyBodyStream() {
-
- $message = new MessageMock();
- $body = $message->getBodyAsStream();
-
- $this->assertEquals('', stream_get_contents($body));
-
- }
-
- function testGetEmptyBodyString() {
-
- $message = new MessageMock();
- $body = $message->getBodyAsString();
-
- $this->assertEquals('', $body);
-
- }
-
- function testHeaders() {
-
- $message = new MessageMock();
- $message->setHeader('X-Foo', 'bar');
-
- // Testing caselessness
- $this->assertEquals('bar', $message->getHeader('X-Foo'));
- $this->assertEquals('bar', $message->getHeader('x-fOO'));
-
- $this->assertTrue(
- $message->removeHeader('X-FOO')
- );
- $this->assertNull($message->getHeader('X-Foo'));
- $this->assertFalse(
- $message->removeHeader('X-FOO')
- );
-
- }
-
- function testSetHeaders() {
-
- $message = new MessageMock();
-
- $headers = [
- 'X-Foo' => ['1'],
- 'X-Bar' => ['2'],
- ];
-
- $message->setHeaders($headers);
- $this->assertEquals($headers, $message->getHeaders());
-
- $message->setHeaders([
- 'X-Foo' => ['3', '4'],
- 'X-Bar' => '5',
- ]);
-
- $expected = [
- 'X-Foo' => ['3','4'],
- 'X-Bar' => ['5'],
- ];
-
- $this->assertEquals($expected, $message->getHeaders());
-
- }
-
- function testAddHeaders() {
-
- $message = new MessageMock();
-
- $headers = [
- 'X-Foo' => ['1'],
- 'X-Bar' => ['2'],
- ];
-
- $message->addHeaders($headers);
- $this->assertEquals($headers, $message->getHeaders());
-
- $message->addHeaders([
- 'X-Foo' => ['3', '4'],
- 'X-Bar' => '5',
- ]);
-
- $expected = [
- 'X-Foo' => ['1','3','4'],
- 'X-Bar' => ['2','5'],
- ];
-
- $this->assertEquals($expected, $message->getHeaders());
-
- }
-
- function testSendBody() {
-
- $message = new MessageMock();
-
- // String
- $message->setBody('foo');
-
- // Stream
- $h = fopen('php://memory', 'r+');
- fwrite($h, 'bar');
- rewind($h);
- $message->setBody($h);
-
- $body = $message->getBody();
- rewind($body);
-
- $this->assertEquals('bar', stream_get_contents($body));
-
- }
-
- function testMultipleHeaders() {
-
- $message = new MessageMock();
- $message->setHeader('a', '1');
- $message->addHeader('A', '2');
-
- $this->assertEquals(
- "1,2",
- $message->getHeader('A')
- );
- $this->assertEquals(
- "1,2",
- $message->getHeader('a')
- );
-
- $this->assertEquals(
- ['1', '2'],
- $message->getHeaderAsArray('a')
- );
- $this->assertEquals(
- ['1', '2'],
- $message->getHeaderAsArray('A')
- );
- $this->assertEquals(
- [],
- $message->getHeaderAsArray('B')
- );
-
- }
-
- function testHasHeaders() {
-
- $message = new MessageMock();
-
- $this->assertFalse($message->hasHeader('X-Foo'));
- $message->setHeader('X-Foo', 'Bar');
- $this->assertTrue($message->hasHeader('X-Foo'));
-
- }
-
-}
-
-class MessageMock extends Message { }
diff --git a/htdocs/includes/sabre/sabre/http/tests/HTTP/RequestDecoratorTest.php b/htdocs/includes/sabre/sabre/http/tests/HTTP/RequestDecoratorTest.php
deleted file mode 100644
index 08af48749bd..00000000000
--- a/htdocs/includes/sabre/sabre/http/tests/HTTP/RequestDecoratorTest.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-class RequestDecoratorTest extends \PHPUnit_Framework_TestCase {
-
- protected $inner;
- protected $outer;
-
- function setUp() {
-
- $this->inner = new Request();
- $this->outer = new RequestDecorator($this->inner);
-
- }
-
- function testMethod() {
-
- $this->outer->setMethod('FOO');
- $this->assertEquals('FOO', $this->inner->getMethod());
- $this->assertEquals('FOO', $this->outer->getMethod());
-
- }
-
- function testUrl() {
-
- $this->outer->setUrl('/foo');
- $this->assertEquals('/foo', $this->inner->getUrl());
- $this->assertEquals('/foo', $this->outer->getUrl());
-
- }
-
- function testAbsoluteUrl() {
-
- $this->outer->setAbsoluteUrl('http://example.org/foo');
- $this->assertEquals('http://example.org/foo', $this->inner->getAbsoluteUrl());
- $this->assertEquals('http://example.org/foo', $this->outer->getAbsoluteUrl());
-
- }
-
- function testBaseUrl() {
-
- $this->outer->setBaseUrl('/foo');
- $this->assertEquals('/foo', $this->inner->getBaseUrl());
- $this->assertEquals('/foo', $this->outer->getBaseUrl());
-
- }
-
- function testPath() {
-
- $this->outer->setBaseUrl('/foo');
- $this->outer->setUrl('/foo/bar');
- $this->assertEquals('bar', $this->inner->getPath());
- $this->assertEquals('bar', $this->outer->getPath());
-
- }
-
- function testQueryParams() {
-
- $this->outer->setUrl('/foo?a=b&c=d&e');
- $expected = [
- 'a' => 'b',
- 'c' => 'd',
- 'e' => null,
- ];
-
- $this->assertEquals($expected, $this->inner->getQueryParameters());
- $this->assertEquals($expected, $this->outer->getQueryParameters());
-
- }
-
- function testPostData() {
-
- $postData = [
- 'a' => 'b',
- 'c' => 'd',
- 'e' => null,
- ];
-
- $this->outer->setPostData($postData);
- $this->assertEquals($postData, $this->inner->getPostData());
- $this->assertEquals($postData, $this->outer->getPostData());
-
- }
-
-
- function testServerData() {
-
- $serverData = [
- 'HTTPS' => 'On',
- ];
-
- $this->outer->setRawServerData($serverData);
- $this->assertEquals('On', $this->inner->getRawServerValue('HTTPS'));
- $this->assertEquals('On', $this->outer->getRawServerValue('HTTPS'));
-
- $this->assertNull($this->inner->getRawServerValue('FOO'));
- $this->assertNull($this->outer->getRawServerValue('FOO'));
- }
-
- function testToString() {
-
- $this->inner->setMethod('POST');
- $this->inner->setUrl('/foo/bar/');
- $this->inner->setBody('foo');
- $this->inner->setHeader('foo', 'bar');
-
- $this->assertEquals((string)$this->inner, (string)$this->outer);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/http/tests/HTTP/RequestTest.php b/htdocs/includes/sabre/sabre/http/tests/HTTP/RequestTest.php
deleted file mode 100644
index e3daab4d354..00000000000
--- a/htdocs/includes/sabre/sabre/http/tests/HTTP/RequestTest.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-class RequestTest extends \PHPUnit_Framework_TestCase {
-
- function testConstruct() {
-
- $request = new Request('GET', '/foo', [
- 'User-Agent' => 'Evert',
- ]);
- $this->assertEquals('GET', $request->getMethod());
- $this->assertEquals('/foo', $request->getUrl());
- $this->assertEquals([
- 'User-Agent' => ['Evert'],
- ], $request->getHeaders());
-
- }
-
- function testGetQueryParameters() {
-
- $request = new Request('GET', '/foo?a=b&c&d=e');
- $this->assertEquals([
- 'a' => 'b',
- 'c' => null,
- 'd' => 'e',
- ], $request->getQueryParameters());
-
- }
-
- function testGetQueryParametersNoData() {
-
- $request = new Request('GET', '/foo');
- $this->assertEquals([], $request->getQueryParameters());
-
- }
-
- /**
- * @backupGlobals
- */
- function testCreateFromPHPRequest() {
-
- $_SERVER['REQUEST_METHOD'] = 'PUT';
-
- $request = Sapi::getRequest();
- $this->assertEquals('PUT', $request->getMethod());
-
- }
-
- function testGetAbsoluteUrl() {
-
- $s = [
- 'HTTP_HOST' => 'sabredav.org',
- 'REQUEST_URI' => '/foo'
- ];
-
- $r = Sapi::createFromServerArray($s);
-
- $this->assertEquals('http://sabredav.org/foo', $r->getAbsoluteUrl());
-
- $s = [
- 'HTTP_HOST' => 'sabredav.org',
- 'REQUEST_URI' => '/foo',
- 'HTTPS' => 'on',
- ];
-
- $r = Sapi::createFromServerArray($s);
-
- $this->assertEquals('https://sabredav.org/foo', $r->getAbsoluteUrl());
-
- }
-
- function testGetPostData() {
-
- $post = [
- 'bla' => 'foo',
- ];
- $r = new Request();
- $r->setPostData($post);
- $this->assertEquals($post, $r->getPostData());
-
- }
-
- function testGetPath() {
-
- $request = new Request();
- $request->setBaseUrl('/foo');
- $request->setUrl('/foo/bar/');
-
- $this->assertEquals('bar', $request->getPath());
-
- }
-
- function testGetPathStrippedQuery() {
-
- $request = new Request();
- $request->setBaseUrl('/foo');
- $request->setUrl('/foo/bar/?a=b');
-
- $this->assertEquals('bar', $request->getPath());
-
- }
-
- function testGetPathMissingSlash() {
-
- $request = new Request();
- $request->setBaseUrl('/foo/');
- $request->setUrl('/foo');
-
- $this->assertEquals('', $request->getPath());
-
- }
-
- /**
- * @expectedException \LogicException
- */
- function testGetPathOutsideBaseUrl() {
-
- $request = new Request();
- $request->setBaseUrl('/foo/');
- $request->setUrl('/bar/');
-
- $request->getPath();
-
- }
-
- function testToString() {
-
- $request = new Request('PUT', '/foo/bar', ['Content-Type' => 'text/xml']);
- $request->setBody('foo');
-
- $expected = <<<HI
-PUT /foo/bar HTTP/1.1\r
-Content-Type: text/xml\r
-\r
-foo
-HI;
- $this->assertEquals($expected, (string)$request);
-
- }
-
- function testToStringAuthorization() {
-
- $request = new Request('PUT', '/foo/bar', ['Content-Type' => 'text/xml', 'Authorization' => 'Basic foobar']);
- $request->setBody('foo');
-
- $expected = <<<HI
-PUT /foo/bar HTTP/1.1\r
-Content-Type: text/xml\r
-Authorization: Basic REDACTED\r
-\r
-foo
-HI;
- $this->assertEquals($expected, (string)$request);
-
- }
-
- /**
- * @expectedException \InvalidArgumentException
- */
- function testConstructorWithArray() {
-
- $request = new Request([]);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/http/tests/HTTP/ResponseDecoratorTest.php b/htdocs/includes/sabre/sabre/http/tests/HTTP/ResponseDecoratorTest.php
deleted file mode 100644
index 838953b3144..00000000000
--- a/htdocs/includes/sabre/sabre/http/tests/HTTP/ResponseDecoratorTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-class ResponseDecoratorTest extends \PHPUnit_Framework_TestCase {
-
- protected $inner;
- protected $outer;
-
- function setUp() {
-
- $this->inner = new Response();
- $this->outer = new ResponseDecorator($this->inner);
-
- }
-
- function testStatus() {
-
- $this->outer->setStatus(201);
- $this->assertEquals(201, $this->inner->getStatus());
- $this->assertEquals(201, $this->outer->getStatus());
- $this->assertEquals('Created', $this->inner->getStatusText());
- $this->assertEquals('Created', $this->outer->getStatusText());
-
- }
-
- function testToString() {
-
- $this->inner->setStatus(201);
- $this->inner->setBody('foo');
- $this->inner->setHeader('foo', 'bar');
-
- $this->assertEquals((string)$this->inner, (string)$this->outer);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/http/tests/HTTP/ResponseTest.php b/htdocs/includes/sabre/sabre/http/tests/HTTP/ResponseTest.php
deleted file mode 100644
index 117551bb969..00000000000
--- a/htdocs/includes/sabre/sabre/http/tests/HTTP/ResponseTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-class ResponseTest extends \PHPUnit_Framework_TestCase {
-
- function testConstruct() {
-
- $response = new Response(200, ['Content-Type' => 'text/xml']);
- $this->assertEquals(200, $response->getStatus());
- $this->assertEquals('OK', $response->getStatusText());
-
- }
-
- function testSetStatus() {
-
- $response = new Response();
- $response->setStatus('402 Where\'s my money?');
- $this->assertEquals(402, $response->getStatus());
- $this->assertEquals('Where\'s my money?', $response->getStatusText());
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testInvalidStatus() {
-
- $response = new Response(1000);
-
- }
-
- function testToString() {
-
- $response = new Response(200, ['Content-Type' => 'text/xml']);
- $response->setBody('foo');
-
- $expected = <<<HI
-HTTP/1.1 200 OK\r
-Content-Type: text/xml\r
-\r
-foo
-HI;
- $this->assertEquals($expected, (string)$response);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/http/tests/HTTP/SapiTest.php b/htdocs/includes/sabre/sabre/http/tests/HTTP/SapiTest.php
deleted file mode 100644
index 158ce2171b9..00000000000
--- a/htdocs/includes/sabre/sabre/http/tests/HTTP/SapiTest.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-class SapiTest extends \PHPUnit_Framework_TestCase {
-
- function testConstructFromServerArray() {
-
- $request = Sapi::createFromServerArray([
- 'REQUEST_URI' => '/foo',
- 'REQUEST_METHOD' => 'GET',
- 'HTTP_USER_AGENT' => 'Evert',
- 'CONTENT_TYPE' => 'text/xml',
- 'CONTENT_LENGTH' => '400',
- 'SERVER_PROTOCOL' => 'HTTP/1.0',
- ]);
-
- $this->assertEquals('GET', $request->getMethod());
- $this->assertEquals('/foo', $request->getUrl());
- $this->assertEquals([
- 'User-Agent' => ['Evert'],
- 'Content-Type' => ['text/xml'],
- 'Content-Length' => ['400'],
- ], $request->getHeaders());
-
- $this->assertEquals('1.0', $request->getHttpVersion());
-
- $this->assertEquals('400', $request->getRawServerValue('CONTENT_LENGTH'));
- $this->assertNull($request->getRawServerValue('FOO'));
-
- }
-
- function testConstructPHPAuth() {
-
- $request = Sapi::createFromServerArray([
- 'REQUEST_URI' => '/foo',
- 'REQUEST_METHOD' => 'GET',
- 'PHP_AUTH_USER' => 'user',
- 'PHP_AUTH_PW' => 'pass',
- ]);
-
- $this->assertEquals('GET', $request->getMethod());
- $this->assertEquals('/foo', $request->getUrl());
- $this->assertEquals([
- 'Authorization' => ['Basic ' . base64_encode('user:pass')],
- ], $request->getHeaders());
-
- }
-
- function testConstructPHPAuthDigest() {
-
- $request = Sapi::createFromServerArray([
- 'REQUEST_URI' => '/foo',
- 'REQUEST_METHOD' => 'GET',
- 'PHP_AUTH_DIGEST' => 'blabla',
- ]);
-
- $this->assertEquals('GET', $request->getMethod());
- $this->assertEquals('/foo', $request->getUrl());
- $this->assertEquals([
- 'Authorization' => ['Digest blabla'],
- ], $request->getHeaders());
-
- }
-
- function testConstructRedirectAuth() {
-
- $request = Sapi::createFromServerArray([
- 'REQUEST_URI' => '/foo',
- 'REQUEST_METHOD' => 'GET',
- 'REDIRECT_HTTP_AUTHORIZATION' => 'Basic bla',
- ]);
-
- $this->assertEquals('GET', $request->getMethod());
- $this->assertEquals('/foo', $request->getUrl());
- $this->assertEquals([
- 'Authorization' => ['Basic bla'],
- ], $request->getHeaders());
-
- }
-
- /**
- * @runInSeparateProcess
- *
- * Unfortunately we have no way of testing if the HTTP response code got
- * changed.
- */
- function testSend() {
-
- if (!function_exists('xdebug_get_headers')) {
- $this->markTestSkipped('XDebug needs to be installed for this test to run');
- }
-
- $response = new Response(204, ['Content-Type' => 'text/xml;charset=UTF-8']);
-
- // Second Content-Type header. Normally this doesn't make sense.
- $response->addHeader('Content-Type', 'application/xml');
- $response->setBody('foo');
-
- ob_start();
-
- Sapi::sendResponse($response);
- $headers = xdebug_get_headers();
-
- $result = ob_get_clean();
- header_remove();
-
- $this->assertEquals(
- [
- "Content-Type: text/xml;charset=UTF-8",
- "Content-Type: application/xml",
- ],
- $headers
- );
-
- $this->assertEquals('foo', $result);
-
- }
-
- /**
- * @runInSeparateProcess
- * @depends testSend
- */
- function testSendLimitedByContentLengthString() {
-
- $response = new Response(200);
-
- $response->addHeader('Content-Length', 19);
- $response->setBody('Send this sentence. Ignore this one.');
-
- ob_start();
-
- Sapi::sendResponse($response);
-
- $result = ob_get_clean();
- header_remove();
-
- $this->assertEquals('Send this sentence.', $result);
-
- }
-
- /**
- * @runInSeparateProcess
- * @depends testSend
- */
- function testSendLimitedByContentLengthStream() {
-
- $response = new Response(200, ['Content-Length' => 19]);
-
- $body = fopen('php://memory', 'w');
- fwrite($body, 'Ignore this. Send this sentence. Ignore this too.');
- rewind($body);
- fread($body, 13);
- $response->setBody($body);
-
- ob_start();
-
- Sapi::sendResponse($response);
-
- $result = ob_get_clean();
- header_remove();
-
- $this->assertEquals('Send this sentence.', $result);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/http/tests/HTTP/URLUtilTest.php b/htdocs/includes/sabre/sabre/http/tests/HTTP/URLUtilTest.php
deleted file mode 100644
index a2d65a5e36d..00000000000
--- a/htdocs/includes/sabre/sabre/http/tests/HTTP/URLUtilTest.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-class URLUtilTest extends \PHPUnit_Framework_TestCase{
-
- function testEncodePath() {
-
- $str = '';
- for ($i = 0;$i < 128;$i++) $str .= chr($i);
-
- $newStr = URLUtil::encodePath($str);
-
- $this->assertEquals(
- '%00%01%02%03%04%05%06%07%08%09%0a%0b%0c%0d%0e%0f' .
- '%10%11%12%13%14%15%16%17%18%19%1a%1b%1c%1d%1e%1f' .
- '%20%21%22%23%24%25%26%27()%2a%2b%2c-./' .
- '0123456789:%3b%3c%3d%3e%3f' .
- '@ABCDEFGHIJKLMNO' .
- 'PQRSTUVWXYZ%5b%5c%5d%5e_' .
- '%60abcdefghijklmno' .
- 'pqrstuvwxyz%7b%7c%7d~%7f',
- $newStr);
-
- $this->assertEquals($str, URLUtil::decodePath($newStr));
-
- }
-
- function testEncodePathSegment() {
-
- $str = '';
- for ($i = 0;$i < 128;$i++) $str .= chr($i);
-
- $newStr = URLUtil::encodePathSegment($str);
-
- // Note: almost exactly the same as the last test, with the
- // exception of the encoding of / (ascii code 2f)
- $this->assertEquals(
- '%00%01%02%03%04%05%06%07%08%09%0a%0b%0c%0d%0e%0f' .
- '%10%11%12%13%14%15%16%17%18%19%1a%1b%1c%1d%1e%1f' .
- '%20%21%22%23%24%25%26%27()%2a%2b%2c-.%2f' .
- '0123456789:%3b%3c%3d%3e%3f' .
- '@ABCDEFGHIJKLMNO' .
- 'PQRSTUVWXYZ%5b%5c%5d%5e_' .
- '%60abcdefghijklmno' .
- 'pqrstuvwxyz%7b%7c%7d~%7f',
- $newStr);
-
- $this->assertEquals($str, URLUtil::decodePathSegment($newStr));
-
- }
-
- function testDecode() {
-
- $str = 'Hello%20Test+Test2.txt';
- $newStr = URLUtil::decodePath($str);
- $this->assertEquals('Hello Test+Test2.txt', $newStr);
-
- }
-
- /**
- * @depends testDecode
- */
- function testDecodeUmlaut() {
-
- $str = 'Hello%C3%BC.txt';
- $newStr = URLUtil::decodePath($str);
- $this->assertEquals("Hello\xC3\xBC.txt", $newStr);
-
- }
-
- /**
- * @depends testDecodeUmlaut
- */
- function testDecodeUmlautLatin1() {
-
- $str = 'Hello%FC.txt';
- $newStr = URLUtil::decodePath($str);
- $this->assertEquals("Hello\xC3\xBC.txt", $newStr);
-
- }
-
- /**
- * This testcase was sent by a bug reporter
- *
- * @depends testDecode
- */
- function testDecodeAccentsWindows7() {
-
- $str = '/webdav/%C3%A0fo%C3%B3';
- $newStr = URLUtil::decodePath($str);
- $this->assertEquals(strtolower($str), URLUtil::encodePath($newStr));
-
- }
-
- function testSplitPath() {
-
- $strings = [
-
- // input // expected result
- '/foo/bar' => ['/foo','bar'],
- '/foo/bar/' => ['/foo','bar'],
- 'foo/bar/' => ['foo','bar'],
- 'foo/bar' => ['foo','bar'],
- 'foo/bar/baz' => ['foo/bar','baz'],
- 'foo/bar/baz/' => ['foo/bar','baz'],
- 'foo' => ['','foo'],
- 'foo/' => ['','foo'],
- '/foo/' => ['','foo'],
- '/foo' => ['','foo'],
- '' => [null,null],
-
- // UTF-8
- "/\xC3\xA0fo\xC3\xB3/bar" => ["/\xC3\xA0fo\xC3\xB3",'bar'],
- "/\xC3\xA0foo/b\xC3\xBCr/" => ["/\xC3\xA0foo","b\xC3\xBCr"],
- "foo/\xC3\xA0\xC3\xBCr" => ["foo","\xC3\xA0\xC3\xBCr"],
-
- ];
-
- foreach ($strings as $input => $expected) {
-
- $output = URLUtil::splitPath($input);
- $this->assertEquals($expected, $output, 'The expected output for \'' . $input . '\' was incorrect');
-
-
- }
-
- }
-
- /**
- * @dataProvider resolveData
- */
- function testResolve($base, $update, $expected) {
-
- $this->assertEquals(
- $expected,
- URLUtil::resolve($base, $update)
- );
-
- }
-
- function resolveData() {
-
- return [
- [
- 'http://example.org/foo/baz',
- '/bar',
- 'http://example.org/bar',
- ],
- [
- 'https://example.org/foo',
- '//example.net/',
- 'https://example.net/',
- ],
- [
- 'https://example.org/foo',
- '?a=b',
- 'https://example.org/foo?a=b',
- ],
- [
- '//example.org/foo',
- '?a=b',
- '//example.org/foo?a=b',
- ],
- // Ports and fragments
- [
- 'https://example.org:81/foo#hey',
- '?a=b#c=d',
- 'https://example.org:81/foo?a=b#c=d',
- ],
- // Relative.. in-directory paths
- [
- 'http://example.org/foo/bar',
- 'bar2',
- 'http://example.org/foo/bar2',
- ],
- // Now the base path ended with a slash
- [
- 'http://example.org/foo/bar/',
- 'bar2/bar3',
- 'http://example.org/foo/bar/bar2/bar3',
- ],
- ];
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/http/tests/HTTP/UtilTest.php b/htdocs/includes/sabre/sabre/http/tests/HTTP/UtilTest.php
deleted file mode 100644
index 5659bdd2e82..00000000000
--- a/htdocs/includes/sabre/sabre/http/tests/HTTP/UtilTest.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-
-namespace Sabre\HTTP;
-
-class UtilTest extends \PHPUnit_Framework_TestCase {
-
- function testParseHTTPDate() {
-
- $times = [
- 'Wed, 13 Oct 2010 10:26:00 GMT',
- 'Wednesday, 13-Oct-10 10:26:00 GMT',
- 'Wed Oct 13 10:26:00 2010',
- ];
-
- $expected = 1286965560;
-
- foreach ($times as $time) {
- $result = Util::parseHTTPDate($time);
- $this->assertEquals($expected, $result->format('U'));
- }
-
- $result = Util::parseHTTPDate('Wed Oct 6 10:26:00 2010');
- $this->assertEquals(1286360760, $result->format('U'));
-
- }
-
- function testParseHTTPDateFail() {
-
- $times = [
- //random string
- 'NOW',
- // not-GMT timezone
- 'Wednesday, 13-Oct-10 10:26:00 UTC',
- // No space before the 6
- 'Wed Oct 6 10:26:00 2010',
- // Invalid day
- 'Wed Oct 0 10:26:00 2010',
- 'Wed Oct 32 10:26:00 2010',
- 'Wed, 0 Oct 2010 10:26:00 GMT',
- 'Wed, 32 Oct 2010 10:26:00 GMT',
- 'Wednesday, 32-Oct-10 10:26:00 GMT',
- // Invalid hour
- 'Wed, 13 Oct 2010 24:26:00 GMT',
- 'Wednesday, 13-Oct-10 24:26:00 GMT',
- 'Wed Oct 13 24:26:00 2010',
- ];
-
- foreach ($times as $time) {
- $this->assertFalse(Util::parseHTTPDate($time), 'We used the string: ' . $time);
- }
-
- }
-
- function testTimezones() {
-
- $default = date_default_timezone_get();
- date_default_timezone_set('Europe/Amsterdam');
-
- $this->testParseHTTPDate();
-
- date_default_timezone_set($default);
-
- }
-
- function testToHTTPDate() {
-
- $dt = new \DateTime('2011-12-10 12:00:00 +0200');
-
- $this->assertEquals(
- 'Sat, 10 Dec 2011 10:00:00 GMT',
- Util::toHTTPDate($dt)
- );
-
- }
-
- /**
- * @dataProvider negotiateData
- */
- function testNegotiate($acceptHeader, $available, $expected) {
-
- $this->assertEquals(
- $expected,
- Util::negotiate($acceptHeader, $available)
- );
-
- }
-
- function negotiateData() {
-
- return [
- [ // simple
- 'application/xml',
- ['application/xml'],
- 'application/xml',
- ],
- [ // no header
- null,
- ['application/xml'],
- 'application/xml',
- ],
- [ // 2 options
- 'application/json',
- ['application/xml', 'application/json'],
- 'application/json',
- ],
- [ // 2 choices
- 'application/json, application/xml',
- ['application/xml'],
- 'application/xml',
- ],
- [ // quality
- 'application/xml;q=0.2, application/json',
- ['application/xml', 'application/json'],
- 'application/json',
- ],
- [ // wildcard
- 'image/jpeg, image/png, */*',
- ['application/xml', 'application/json'],
- 'application/xml',
- ],
- [ // wildcard + quality
- 'image/jpeg, image/png; q=0.5, */*',
- ['application/xml', 'application/json', 'image/png'],
- 'application/xml',
- ],
- [ // no match
- 'image/jpeg',
- ['application/xml'],
- null,
- ],
- [ // This is used in sabre/dav
- 'text/vcard; version=4.0',
- [
- // Most often used mime-type. Version 3
- 'text/x-vcard',
- // The correct standard mime-type. Defaults to version 3 as
- // well.
- 'text/vcard',
- // vCard 4
- 'text/vcard; version=4.0',
- // vCard 3
- 'text/vcard; version=3.0',
- // jCard
- 'application/vcard+json',
- ],
- 'text/vcard; version=4.0',
-
- ],
- [ // rfc7231 example 1
- 'audio/*; q=0.2, audio/basic',
- [
- 'audio/pcm',
- 'audio/basic',
- ],
- 'audio/basic',
- ],
- [ // Lower quality after
- 'audio/pcm; q=0.2, audio/basic; q=0.1',
- [
- 'audio/pcm',
- 'audio/basic',
- ],
- 'audio/pcm',
- ],
- [ // Random parameter, should be ignored
- 'audio/pcm; hello; q=0.2, audio/basic; q=0.1',
- [
- 'audio/pcm',
- 'audio/basic',
- ],
- 'audio/pcm',
- ],
- [ // No whitepace after type, should pick the one that is the most specific.
- 'text/vcard;version=3.0, text/vcard',
- [
- 'text/vcard',
- 'text/vcard; version=3.0'
- ],
- 'text/vcard; version=3.0',
- ],
- [ // Same as last one, but order is different
- 'text/vcard, text/vcard;version=3.0',
- [
- 'text/vcard; version=3.0',
- 'text/vcard',
- ],
- 'text/vcard; version=3.0',
- ],
- [ // Charset should be ignored here.
- 'text/vcard; charset=utf-8; version=3.0, text/vcard',
- [
- 'text/vcard',
- 'text/vcard; version=3.0'
- ],
- 'text/vcard; version=3.0',
- ],
- [ // Undefined offset issue.
- 'text/html, image/gif, image/jpeg, *; q=.2, */*; q=.2',
- ['application/xml', 'application/json', 'image/png'],
- 'application/xml',
- ],
-
- ];
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/http/tests/bootstrap.php b/htdocs/includes/sabre/sabre/http/tests/bootstrap.php
deleted file mode 100644
index 74931b6f118..00000000000
--- a/htdocs/includes/sabre/sabre/http/tests/bootstrap.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-date_default_timezone_set('UTC');
-
-ini_set('error_reporting', E_ALL | E_STRICT | E_DEPRECATED);
-
-// Composer autoloader
-include __DIR__ . '/../vendor/autoload.php';
diff --git a/htdocs/includes/sabre/sabre/http/tests/phpcs/ruleset.xml b/htdocs/includes/sabre/sabre/http/tests/phpcs/ruleset.xml
deleted file mode 100644
index ec2c4c84b1d..00000000000
--- a/htdocs/includes/sabre/sabre/http/tests/phpcs/ruleset.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="sabre.php">
- <description>sabre.io codesniffer ruleset</description>
-
- <!-- Include the whole PSR-1 standard -->
- <rule ref="PSR1" />
-
- <!-- All PHP files MUST use the Unix LF (linefeed) line ending. -->
- <rule ref="Generic.Files.LineEndings">
- <properties>
- <property name="eolChar" value="\n"/>
- </properties>
- </rule>
-
- <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
- <rule ref="Zend.Files.ClosingTag"/>
-
- <!-- There MUST NOT be trailing whitespace at the end of non-blank lines. -->
- <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
- <properties>
- <property name="ignoreBlankLines" value="true"/>
- </properties>
- </rule>
-
- <!-- There MUST NOT be more than one statement per line. -->
- <rule ref="Generic.Formatting.DisallowMultipleStatements"/>
-
- <rule ref="Generic.WhiteSpace.ScopeIndent">
- <properties>
- <property name="ignoreIndentationTokens" type="array" value="T_COMMENT,T_DOC_COMMENT"/>
- </properties>
- </rule>
- <rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
-
- <!-- PHP keywords MUST be in lower case. -->
- <rule ref="Generic.PHP.LowerCaseKeyword"/>
-
- <!-- The PHP constants true, false, and null MUST be in lower case. -->
- <rule ref="Generic.PHP.LowerCaseConstant"/>
-
- <!-- <rule ref="Squiz.Scope.MethodScope"/> -->
- <rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing"/>
-
- <!-- In the argument list, there MUST NOT be a space before each comma, and there MUST be one space after each comma. -->
- <!--
- <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing">
- <properties>
- <property name="equalsSpacing" value="1"/>
- </properties>
- </rule>
- <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint">
- <severity>0</severity>
- </rule>
- -->
- <rule ref="PEAR.WhiteSpace.ScopeClosingBrace"/>
-
-</ruleset>
diff --git a/htdocs/includes/sabre/sabre/http/tests/phpunit.xml b/htdocs/includes/sabre/sabre/http/tests/phpunit.xml
deleted file mode 100644
index 32d701a37f7..00000000000
--- a/htdocs/includes/sabre/sabre/http/tests/phpunit.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<phpunit
- colors="true"
- bootstrap="bootstrap.php"
- convertErrorsToExceptions="true"
- convertNoticesToExceptions="true"
- convertWarningsToExceptions="true"
- strict="true"
- >
- <testsuite name="Sabre_HTTP">
- <directory>HTTP/</directory>
- </testsuite>
-
- <filter>
- <whitelist addUncoveredFilesFromWhitelist="true">
- <directory suffix=".php">../lib/</directory>
- </whitelist>
- </filter>
-</phpunit>
diff --git a/htdocs/includes/sabre/sabre/uri/tests/BuildTest.php b/htdocs/includes/sabre/sabre/uri/tests/BuildTest.php
deleted file mode 100644
index ae4b4ba2719..00000000000
--- a/htdocs/includes/sabre/sabre/uri/tests/BuildTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Sabre\Uri;
-
-class BuildTest extends \PHPUnit_Framework_TestCase{
-
- /**
- * @dataProvider buildUriData
- */
- function testBuild($value) {
-
- $this->assertEquals(
- $value,
- build(parse_url($value))
- );
-
- }
-
- function buildUriData() {
-
- return [
- ['http://example.org/'],
- ['http://example.org/foo/bar'],
- ['//example.org/foo/bar'],
- ['/foo/bar'],
- ['http://example.org:81/'],
- ['http://user@example.org:81/'],
- ['http://example.org:81/hi?a=b'],
- ['http://example.org:81/hi?a=b#c=d'],
- // [ '//example.org:81/hi?a=b#c=d'], // Currently fails due to a
- // PHP bug.
- ['/hi?a=b#c=d'],
- ['?a=b#c=d'],
- ['#c=d'],
- ['file:///etc/hosts'],
- ['file://localhost/etc/hosts'],
- ];
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/uri/tests/NormalizeTest.php b/htdocs/includes/sabre/sabre/uri/tests/NormalizeTest.php
deleted file mode 100644
index 4dbe943205e..00000000000
--- a/htdocs/includes/sabre/sabre/uri/tests/NormalizeTest.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace Sabre\Uri;
-
-class NormalizeTest extends \PHPUnit_Framework_TestCase{
-
- /**
- * @dataProvider normalizeData
- */
- function testNormalize($in, $out) {
-
- $this->assertEquals(
- $out,
- normalize($in)
- );
-
- }
-
- function normalizeData() {
-
- return [
- ['http://example.org/', 'http://example.org/'],
- ['HTTP://www.EXAMPLE.com/', 'http://www.example.com/'],
- ['http://example.org/%7Eevert', 'http://example.org/~evert'],
- ['http://example.org/./evert', 'http://example.org/evert'],
- ['http://example.org/../evert', 'http://example.org/evert'],
- ['http://example.org/foo/../evert', 'http://example.org/evert'],
- ['/%41', '/A'],
- ['/%3F', '/%3F'],
- ['/%3f', '/%3F'],
- ['http://example.org', 'http://example.org/'],
- ['http://example.org:/', 'http://example.org/'],
- ['http://example.org:80/', 'http://example.org/'],
- // See issue #6. parse_url corrupts strings like this, but only on
- // macs.
- //[ 'http://example.org/有词法别名.zh','http://example.org/%E6%9C%89%E8%AF%8D%E6%B3%95%E5%88%AB%E5%90%8D.zh'],
-
- ];
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/uri/tests/ParseTest.php b/htdocs/includes/sabre/sabre/uri/tests/ParseTest.php
deleted file mode 100644
index ab0ead2cc96..00000000000
--- a/htdocs/includes/sabre/sabre/uri/tests/ParseTest.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-
-namespace Sabre\Uri;
-
-class ParseTest extends \PHPUnit_Framework_TestCase{
-
- /**
- * @dataProvider parseData
- */
- function testParse($in, $out) {
-
- $this->assertEquals(
- $out,
- parse($in)
- );
-
- }
-
- /**
- * @dataProvider parseData
- */
- function testParseFallback($in, $out) {
-
- $result = _parse_fallback($in);
- $result = $result + [
- 'scheme' => null,
- 'host' => null,
- 'path' => null,
- 'port' => null,
- 'user' => null,
- 'query' => null,
- 'fragment' => null,
- ];
-
- $this->assertEquals(
- $out,
- $result
- );
-
- }
-
- function parseData() {
-
- return [
- [
- 'http://example.org/hello?foo=bar#test',
- [
- 'scheme' => 'http',
- 'host' => 'example.org',
- 'path' => '/hello',
- 'port' => null,
- 'user' => null,
- 'query' => 'foo=bar',
- 'fragment' => 'test'
- ]
- ],
- // See issue #6. parse_url corrupts strings like this, but only on
- // macs.
- [
- 'http://example.org/有词法别名.zh',
- [
- 'scheme' => 'http',
- 'host' => 'example.org',
- 'path' => '/%E6%9C%89%E8%AF%8D%E6%B3%95%E5%88%AB%E5%90%8D.zh',
- 'port' => null,
- 'user' => null,
- 'query' => null,
- 'fragment' => null
- ]
- ],
- [
- 'ftp://user:password@ftp.example.org/',
- [
- 'scheme' => 'ftp',
- 'host' => 'ftp.example.org',
- 'path' => '/',
- 'port' => null,
- 'user' => 'user',
- 'pass' => 'password',
- 'query' => null,
- 'fragment' => null,
- ]
- ],
- // See issue #9, parse_url doesn't like colons followed by numbers even
- // though they are allowed since RFC 3986
- [
- 'http://example.org/hello:12?foo=bar#test',
- [
- 'scheme' => 'http',
- 'host' => 'example.org',
- 'path' => '/hello:12',
- 'port' => null,
- 'user' => null,
- 'query' => 'foo=bar',
- 'fragment' => 'test'
- ]
- ],
- [
- '/path/to/colon:34',
- [
- 'scheme' => null,
- 'host' => null,
- 'path' => '/path/to/colon:34',
- 'port' => null,
- 'user' => null,
- 'query' => null,
- 'fragment' => null,
- ]
- ],
- // File scheme
- [
- 'file:///foo/bar',
- [
- 'scheme' => 'file',
- 'host' => '',
- 'path' => '/foo/bar',
- 'port' => null,
- 'user' => null,
- 'query' => null,
- 'fragment' => null,
- ]
- ],
- // Weird scheme with triple-slash. See Issue #11.
- [
- 'vfs:///somefile',
- [
- 'scheme' => 'vfs',
- 'host' => '',
- 'path' => '/somefile',
- 'port' => null,
- 'user' => null,
- 'query' => null,
- 'fragment' => null,
- ]
- ],
- // Examples from RFC3986
- [
- 'ldap://[2001:db8::7]/c=GB?objectClass?one',
- [
- 'scheme' => 'ldap',
- 'host' => '[2001:db8::7]',
- 'path' => '/c=GB',
- 'port' => null,
- 'user' => null,
- 'query' => 'objectClass?one',
- 'fragment' => null,
- ]
- ],
- [
- 'news:comp.infosystems.www.servers.unix',
- [
- 'scheme' => 'news',
- 'host' => null,
- 'path' => 'comp.infosystems.www.servers.unix',
- 'port' => null,
- 'user' => null,
- 'query' => null,
- 'fragment' => null,
- ]
- ],
- // Port
- [
- 'http://example.org:8080/',
- [
- 'scheme' => 'http',
- 'host' => 'example.org',
- 'path' => '/',
- 'port' => 8080,
- 'user' => null,
- 'query' => null,
- 'fragment' => null,
- ]
- ],
-
- ];
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/uri/tests/ResolveTest.php b/htdocs/includes/sabre/sabre/uri/tests/ResolveTest.php
deleted file mode 100644
index 73e4dea69d8..00000000000
--- a/htdocs/includes/sabre/sabre/uri/tests/ResolveTest.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-namespace Sabre\Uri;
-
-class ResolveTest extends \PHPUnit_Framework_TestCase{
-
- /**
- * @dataProvider resolveData
- */
- function testResolve($base, $update, $expected) {
-
- $this->assertEquals(
- $expected,
- resolve($base, $update)
- );
-
- }
-
- function resolveData() {
-
- return [
- [
- 'http://example.org/foo/baz',
- '/bar',
- 'http://example.org/bar',
- ],
- [
- 'https://example.org/foo',
- '//example.net/',
- 'https://example.net/',
- ],
- [
- 'https://example.org/foo',
- '?a=b',
- 'https://example.org/foo?a=b',
- ],
- [
- '//example.org/foo',
- '?a=b',
- '//example.org/foo?a=b',
- ],
- // Ports and fragments
- [
- 'https://example.org:81/foo#hey',
- '?a=b#c=d',
- 'https://example.org:81/foo?a=b#c=d',
- ],
- // Relative.. in-directory paths
- [
- 'http://example.org/foo/bar',
- 'bar2',
- 'http://example.org/foo/bar2',
- ],
- // Now the base path ended with a slash
- [
- 'http://example.org/foo/bar/',
- 'bar2/bar3',
- 'http://example.org/foo/bar/bar2/bar3',
- ],
- // .. and .
- [
- 'http://example.org/foo/bar/',
- '../bar2/.././/bar3/',
- 'http://example.org/foo//bar3/',
- ],
- // Only updating the fragment
- [
- 'https://example.org/foo?a=b',
- '#comments',
- 'https://example.org/foo?a=b#comments',
- ],
- // Switching to mailto!
- [
- 'https://example.org/foo?a=b',
- 'mailto:foo@example.org',
- 'mailto:foo@example.org',
- ],
-
- ];
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/uri/tests/SplitTest.php b/htdocs/includes/sabre/sabre/uri/tests/SplitTest.php
deleted file mode 100644
index 2d73c9b255d..00000000000
--- a/htdocs/includes/sabre/sabre/uri/tests/SplitTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace Sabre\Uri;
-
-class SplitTest extends \PHPUnit_Framework_TestCase{
-
- function testSplit() {
-
- $strings = [
-
- // input // expected result
- '/foo/bar' => ['/foo','bar'],
- '/foo/bar/' => ['/foo','bar'],
- 'foo/bar/' => ['foo','bar'],
- 'foo/bar' => ['foo','bar'],
- 'foo/bar/baz' => ['foo/bar','baz'],
- 'foo/bar/baz/' => ['foo/bar','baz'],
- 'foo' => ['','foo'],
- 'foo/' => ['','foo'],
- '/foo/' => ['','foo'],
- '/foo' => ['','foo'],
- '' => [null,null],
-
- // UTF-8
- "/\xC3\xA0fo\xC3\xB3/bar" => ["/\xC3\xA0fo\xC3\xB3",'bar'],
- "/\xC3\xA0foo/b\xC3\xBCr/" => ["/\xC3\xA0foo","b\xC3\xBCr"],
- "foo/\xC3\xA0\xC3\xBCr" => ["foo","\xC3\xA0\xC3\xBCr"],
-
- ];
-
- foreach ($strings as $input => $expected) {
-
- $output = split($input);
- $this->assertEquals($expected, $output, 'The expected output for \'' . $input . '\' was incorrect');
-
-
- }
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/uri/tests/phpcs/ruleset.xml b/htdocs/includes/sabre/sabre/uri/tests/phpcs/ruleset.xml
deleted file mode 100644
index ec2c4c84b1d..00000000000
--- a/htdocs/includes/sabre/sabre/uri/tests/phpcs/ruleset.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="sabre.php">
- <description>sabre.io codesniffer ruleset</description>
-
- <!-- Include the whole PSR-1 standard -->
- <rule ref="PSR1" />
-
- <!-- All PHP files MUST use the Unix LF (linefeed) line ending. -->
- <rule ref="Generic.Files.LineEndings">
- <properties>
- <property name="eolChar" value="\n"/>
- </properties>
- </rule>
-
- <!-- The closing ?> tag MUST be omitted from files containing only PHP. -->
- <rule ref="Zend.Files.ClosingTag"/>
-
- <!-- There MUST NOT be trailing whitespace at the end of non-blank lines. -->
- <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
- <properties>
- <property name="ignoreBlankLines" value="true"/>
- </properties>
- </rule>
-
- <!-- There MUST NOT be more than one statement per line. -->
- <rule ref="Generic.Formatting.DisallowMultipleStatements"/>
-
- <rule ref="Generic.WhiteSpace.ScopeIndent">
- <properties>
- <property name="ignoreIndentationTokens" type="array" value="T_COMMENT,T_DOC_COMMENT"/>
- </properties>
- </rule>
- <rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
-
- <!-- PHP keywords MUST be in lower case. -->
- <rule ref="Generic.PHP.LowerCaseKeyword"/>
-
- <!-- The PHP constants true, false, and null MUST be in lower case. -->
- <rule ref="Generic.PHP.LowerCaseConstant"/>
-
- <!-- <rule ref="Squiz.Scope.MethodScope"/> -->
- <rule ref="Squiz.WhiteSpace.ScopeKeywordSpacing"/>
-
- <!-- In the argument list, there MUST NOT be a space before each comma, and there MUST be one space after each comma. -->
- <!--
- <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing">
- <properties>
- <property name="equalsSpacing" value="1"/>
- </properties>
- </rule>
- <rule ref="Squiz.Functions.FunctionDeclarationArgumentSpacing.SpacingAfterHint">
- <severity>0</severity>
- </rule>
- -->
- <rule ref="PEAR.WhiteSpace.ScopeClosingBrace"/>
-
-</ruleset>
diff --git a/htdocs/includes/sabre/sabre/uri/tests/phpunit.xml.dist b/htdocs/includes/sabre/sabre/uri/tests/phpunit.xml.dist
deleted file mode 100644
index 338d24d3c06..00000000000
--- a/htdocs/includes/sabre/sabre/uri/tests/phpunit.xml.dist
+++ /dev/null
@@ -1,18 +0,0 @@
-<phpunit
- colors="true"
- bootstrap="../vendor/autoload.php"
- convertErrorsToExceptions="true"
- convertNoticesToExceptions="true"
- convertWarningsToExceptions="true"
- strict="true"
- >
- <testsuite name="sabre-uri">
- <directory>.</directory>
- </testsuite>
-
- <filter>
- <whitelist addUncoveredFilesFromWhitelist="true">
- <directory suffix=".php">../lib/</directory>
- </whitelist>
- </filter>
-</phpunit>
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/AttachIssueTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/AttachIssueTest.php
deleted file mode 100644
index 68c9872bb5b..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/AttachIssueTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class AttachIssueTest extends \PHPUnit_Framework_TestCase {
-
- function testRead() {
-
- $event = <<<ICS
-BEGIN:VCALENDAR\r
-BEGIN:VEVENT\r
-ATTACH;FMTTYPE=;ENCODING=:Zm9v\r
-END:VEVENT\r
-END:VCALENDAR\r
-
-ICS;
- $obj = Reader::read($event);
- $this->assertEquals($event, $obj->serialize());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/BirthdayCalendarGeneratorTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/BirthdayCalendarGeneratorTest.php
deleted file mode 100644
index 54c478eaf46..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/BirthdayCalendarGeneratorTest.php
+++ /dev/null
@@ -1,562 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class BirthdayCalendarGeneratorTest extends \PHPUnit_Framework_TestCase {
-
- use PHPUnitAssertions;
-
- function testVcardStringWithValidBirthday() {
-
- $generator = new BirthdayCalendarGenerator();
- $input = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-N:Gump;Forrest;;Mr.
-FN:Forrest Gump
-BDAY:19850407
-UID:foo
-END:VCARD
-VCF;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:**ANY**
-DTSTAMP:**ANY**
-SUMMARY:Forrest Gump's Birthday
-DTSTART;VALUE=DATE:19850407
-RRULE:FREQ=YEARLY
-TRANSP:TRANSPARENT
-X-SABRE-BDAY;X-SABRE-VCARD-UID=foo;X-SABRE-VCARD-FN=Forrest Gump:BDAY
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $generator->setObjects($input);
- $output = $generator->getResult();
-
- $this->assertVObjectEqualsVObject(
- $expected,
- $output
- );
-
- }
-
- function testArrayOfVcardStringsWithValidBirthdays() {
-
- $generator = new BirthdayCalendarGenerator();
- $input = [];
-
- $input[] = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-N:Gump;Forrest;;Mr.
-FN:Forrest Gump
-BDAY:19850407
-UID:foo
-END:VCARD
-VCF;
-
- $input[] = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-N:Doe;John;;Mr.
-FN:John Doe
-BDAY:19820210
-UID:bar
-END:VCARD
-VCF;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:**ANY**
-DTSTAMP:**ANY**
-SUMMARY:Forrest Gump's Birthday
-DTSTART;VALUE=DATE:19850407
-RRULE:FREQ=YEARLY
-TRANSP:TRANSPARENT
-X-SABRE-BDAY;X-SABRE-VCARD-UID=foo;X-SABRE-VCARD-FN=Forrest Gump:BDAY
-END:VEVENT
-BEGIN:VEVENT
-UID:**ANY**
-DTSTAMP:**ANY**
-SUMMARY:John Doe's Birthday
-DTSTART;VALUE=DATE:19820210
-RRULE:FREQ=YEARLY
-TRANSP:TRANSPARENT
-X-SABRE-BDAY;X-SABRE-VCARD-UID=bar;X-SABRE-VCARD-FN=John Doe:BDAY
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $generator->setObjects($input);
- $output = $generator->getResult();
-
- $this->assertVObjectEqualsVObject(
- $expected,
- $output
- );
-
- }
-
- function testArrayOfVcardStringsWithValidBirthdaysViaConstructor() {
-
- $input = [];
-
- $input[] = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-N:Gump;Forrest;;Mr.
-FN:Forrest Gump
-BDAY:19850407
-UID:foo
-END:VCARD
-VCF;
-
- $input[] = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-N:Doe;John;;Mr.
-FN:John Doe
-BDAY:19820210
-UID:bar
-END:VCARD
-VCF;
-
- $generator = new BirthdayCalendarGenerator($input);
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:**ANY**
-DTSTAMP:**ANY**
-SUMMARY:Forrest Gump's Birthday
-DTSTART;VALUE=DATE:19850407
-RRULE:FREQ=YEARLY
-TRANSP:TRANSPARENT
-X-SABRE-BDAY;X-SABRE-VCARD-UID=foo;X-SABRE-VCARD-FN=Forrest Gump:BDAY
-END:VEVENT
-BEGIN:VEVENT
-UID:**ANY**
-DTSTAMP:**ANY**
-SUMMARY:John Doe's Birthday
-DTSTART;VALUE=DATE:19820210
-RRULE:FREQ=YEARLY
-TRANSP:TRANSPARENT
-X-SABRE-BDAY;X-SABRE-VCARD-UID=bar;X-SABRE-VCARD-FN=John Doe:BDAY
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $generator->setObjects($input);
- $output = $generator->getResult();
-
- $this->assertVObjectEqualsVObject(
- $expected,
- $output
- );
-
- }
-
- function testVcardObjectWithValidBirthday() {
-
- $generator = new BirthdayCalendarGenerator();
- $input = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-N:Gump;Forrest;;Mr.
-FN:Forrest Gump
-BDAY:19850407
-UID:foo
-END:VCARD
-VCF;
-
- $input = Reader::read($input);
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:**ANY**
-DTSTAMP:**ANY**
-SUMMARY:Forrest Gump's Birthday
-DTSTART;VALUE=DATE:19850407
-RRULE:FREQ=YEARLY
-TRANSP:TRANSPARENT
-X-SABRE-BDAY;X-SABRE-VCARD-UID=foo;X-SABRE-VCARD-FN=Forrest Gump:BDAY
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $generator->setObjects($input);
- $output = $generator->getResult();
-
- $this->assertVObjectEqualsVObject(
- $expected,
- $output
- );
-
- }
-
- function testArrayOfVcardObjectsWithValidBirthdays() {
-
- $generator = new BirthdayCalendarGenerator();
- $input = [];
-
- $input[] = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-N:Gump;Forrest;;Mr.
-FN:Forrest Gump
-BDAY:19850407
-UID:foo
-END:VCARD
-VCF;
-
- $input[] = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-N:Doe;John;;Mr.
-FN:John Doe
-BDAY:19820210
-UID:bar
-END:VCARD
-VCF;
-
- foreach ($input as $key => $value) {
- $input[$key] = Reader::read($value);
- }
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:**ANY**
-DTSTAMP:**ANY**
-SUMMARY:Forrest Gump's Birthday
-DTSTART;VALUE=DATE:19850407
-RRULE:FREQ=YEARLY
-TRANSP:TRANSPARENT
-X-SABRE-BDAY;X-SABRE-VCARD-UID=foo;X-SABRE-VCARD-FN=Forrest Gump:BDAY
-END:VEVENT
-BEGIN:VEVENT
-UID:**ANY**
-DTSTAMP:**ANY**
-SUMMARY:John Doe's Birthday
-DTSTART;VALUE=DATE:19820210
-RRULE:FREQ=YEARLY
-TRANSP:TRANSPARENT
-X-SABRE-BDAY;X-SABRE-VCARD-UID=bar;X-SABRE-VCARD-FN=John Doe:BDAY
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $generator->setObjects($input);
- $output = $generator->getResult();
-
- $this->assertVObjectEqualsVObject(
- $expected,
- $output
- );
-
- }
-
- function testVcardStringWithValidBirthdayWithXAppleOmitYear() {
-
- $generator = new BirthdayCalendarGenerator();
- $input = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-N:Gump;Forrest;;Mr.
-FN:Forrest Gump
-BDAY;X-APPLE-OMIT-YEAR=1604:1604-04-07
-UID:foo
-END:VCARD
-VCF;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:**ANY**
-DTSTAMP:**ANY**
-SUMMARY:Forrest Gump's Birthday
-DTSTART;VALUE=DATE:20000407
-RRULE:FREQ=YEARLY
-TRANSP:TRANSPARENT
-X-SABRE-BDAY;X-SABRE-VCARD-UID=foo;X-SABRE-VCARD-FN=Forrest Gump;X-SABRE-OMIT-YEAR=2000:BDAY
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $generator->setObjects($input);
- $output = $generator->getResult();
-
- $this->assertVObjectEqualsVObject(
- $expected,
- $output
- );
-
- }
-
- function testVcardStringWithValidBirthdayWithoutYear() {
-
- $generator = new BirthdayCalendarGenerator();
- $input = <<<VCF
-BEGIN:VCARD
-VERSION:4.0
-N:Gump;Forrest;;Mr.
-FN:Forrest Gump
-BDAY:--04-07
-UID:foo
-END:VCARD
-VCF;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:**ANY**
-DTSTAMP:**ANY**
-SUMMARY:Forrest Gump's Birthday
-DTSTART;VALUE=DATE:20000407
-RRULE:FREQ=YEARLY
-TRANSP:TRANSPARENT
-X-SABRE-BDAY;X-SABRE-VCARD-UID=foo;X-SABRE-VCARD-FN=Forrest Gump;X-SABRE-OMIT-YEAR=2000:BDAY
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $generator->setObjects($input);
- $output = $generator->getResult();
-
- $this->assertVObjectEqualsVObject(
- $expected,
- $output
- );
-
- }
-
- function testVcardStringWithInvalidBirthday() {
-
- $generator = new BirthdayCalendarGenerator();
- $input = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-N:Gump;Forrest;;Mr.
-FN:Forrest Gump
-BDAY:foo
-X-SABRE-BDAY;X-SABRE-VCARD-UID=foo;X-SABRE-VCARD-FN=Forrest Gump:BDAY
-END:VCARD
-VCF;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-END:VCALENDAR
-ICS;
-
- $generator->setObjects($input);
- $output = $generator->getResult();
-
- $this->assertVObjectEqualsVObject(
- $expected,
- $output
- );
-
- }
-
- function testVcardStringWithNoBirthday() {
-
- $generator = new BirthdayCalendarGenerator();
- $input = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-N:Gump;Forrest;;Mr.
-FN:Forrest Gump
-UID:foo
-END:VCARD
-VCF;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-END:VCALENDAR
-ICS;
-
- $generator->setObjects($input);
- $output = $generator->getResult();
-
- $this->assertVObjectEqualsVObject(
- $expected,
- $output
- );
-
- }
-
- function testVcardStringWithValidBirthdayLocalized() {
-
- $generator = new BirthdayCalendarGenerator();
- $input = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-N:Gump;Forrest;;Mr.
-FN:Forrest Gump
-BDAY:19850407
-UID:foo
-END:VCARD
-VCF;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:**ANY**
-DTSTAMP:**ANY**
-SUMMARY:Forrest Gump's Geburtstag
-DTSTART;VALUE=DATE:19850407
-RRULE:FREQ=YEARLY
-TRANSP:TRANSPARENT
-X-SABRE-BDAY;X-SABRE-VCARD-UID=foo;X-SABRE-VCARD-FN=Forrest Gump:BDAY
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $generator->setObjects($input);
- $generator->setFormat('%1$s\'s Geburtstag');
- $output = $generator->getResult();
-
- $this->assertVObjectEqualsVObject(
- $expected,
- $output
- );
-
- }
-
- function testVcardStringWithEmptyBirthdayProperty() {
-
- $generator = new BirthdayCalendarGenerator();
- $input = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-N:Gump;Forrest;;Mr.
-FN:Forrest Gump
-BDAY:
-UID:foo
-END:VCARD
-VCF;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-END:VCALENDAR
-ICS;
-
- $generator->setObjects($input);
- $output = $generator->getResult();
-
- $this->assertVObjectEqualsVObject(
- $expected,
- $output
- );
-
- }
-
- /**
- * @expectedException \Sabre\VObject\ParseException
- */
- function testParseException() {
-
- $generator = new BirthdayCalendarGenerator();
- $input = <<<FOO
-BEGIN:FOO
-FOO:Bar
-END:FOO
-FOO;
-
- $generator->setObjects($input);
-
- }
-
- /**
- * @expectedException \InvalidArgumentException
- */
- function testInvalidArgumentException() {
-
- $generator = new BirthdayCalendarGenerator();
- $input = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SUMMARY:Foo
-DTSTART;VALUE=DATE:19850407
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $generator->setObjects($input);
-
- }
-
- /**
- * @expectedException \InvalidArgumentException
- */
- function testInvalidArgumentExceptionForPartiallyInvalidArray() {
-
- $generator = new BirthdayCalendarGenerator();
- $input = [];
-
- $input[] = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-N:Gump;Forrest;;Mr.
-FN:Forrest Gump
-BDAY:19850407
-UID:foo
-END:VCARD
-VCF;
- $calendar = new Component\VCalendar();
-
- $input = $calendar->add('VEVENT', [
- 'SUMMARY' => 'Foo',
- 'DTSTART' => new \DateTime('NOW'),
- ]);
-
- $generator->setObjects($input);
-
- }
-
- function testBrokenVcardWithoutFN() {
-
- $generator = new BirthdayCalendarGenerator();
- $input = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-N:Gump;Forrest;;Mr.
-BDAY:19850407
-UID:foo
-END:VCARD
-VCF;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-END:VCALENDAR
-ICS;
-
- $generator->setObjects($input);
- $output = $generator->getResult();
-
- $this->assertVObjectEqualsVObject(
- $expected,
- $output
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/CliTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/CliTest.php
deleted file mode 100644
index 67037873e37..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/CliTest.php
+++ /dev/null
@@ -1,642 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-/**
- * Tests the cli.
- *
- * Warning: these tests are very rudimentary.
- */
-class CliTest extends \PHPUnit_Framework_TestCase {
-
- function setUp() {
-
- $this->cli = new CliMock();
- $this->cli->stderr = fopen('php://memory', 'r+');
- $this->cli->stdout = fopen('php://memory', 'r+');
-
- }
-
- function testInvalidArg() {
-
- $this->assertEquals(
- 1,
- $this->cli->main(['vobject', '--hi'])
- );
- rewind($this->cli->stderr);
- $this->assertTrue(strlen(stream_get_contents($this->cli->stderr)) > 100);
-
- }
-
- function testQuiet() {
-
- $this->assertEquals(
- 1,
- $this->cli->main(['vobject', '-q'])
- );
- $this->assertTrue($this->cli->quiet);
-
- rewind($this->cli->stderr);
- $this->assertEquals(0, strlen(stream_get_contents($this->cli->stderr)));
-
- }
-
- function testHelp() {
-
- $this->assertEquals(
- 0,
- $this->cli->main(['vobject', '-h'])
- );
- rewind($this->cli->stderr);
- $this->assertTrue(strlen(stream_get_contents($this->cli->stderr)) > 100);
-
- }
-
- function testFormat() {
-
- $this->assertEquals(
- 1,
- $this->cli->main(['vobject', '--format=jcard'])
- );
-
- rewind($this->cli->stderr);
- $this->assertTrue(strlen(stream_get_contents($this->cli->stderr)) > 100);
-
- $this->assertEquals('jcard', $this->cli->format);
-
- }
-
- function testFormatInvalid() {
-
- $this->assertEquals(
- 1,
- $this->cli->main(['vobject', '--format=foo'])
- );
-
- rewind($this->cli->stderr);
- $this->assertTrue(strlen(stream_get_contents($this->cli->stderr)) > 100);
-
- $this->assertNull($this->cli->format);
-
- }
-
- function testInputFormatInvalid() {
-
- $this->assertEquals(
- 1,
- $this->cli->main(['vobject', '--inputformat=foo'])
- );
-
- rewind($this->cli->stderr);
- $this->assertTrue(strlen(stream_get_contents($this->cli->stderr)) > 100);
-
- $this->assertNull($this->cli->format);
-
- }
-
-
- function testNoInputFile() {
-
- $this->assertEquals(
- 1,
- $this->cli->main(['vobject', 'color'])
- );
-
- rewind($this->cli->stderr);
- $this->assertTrue(strlen(stream_get_contents($this->cli->stderr)) > 100);
-
- }
-
- function testTooManyArgs() {
-
- $this->assertEquals(
- 1,
- $this->cli->main(['vobject', 'color', 'a', 'b', 'c'])
- );
-
- }
-
- function testUnknownCommand() {
-
- $this->assertEquals(
- 1,
- $this->cli->main(['vobject', 'foo', '-'])
- );
-
- }
-
- function testConvertJson() {
-
- $inputStream = fopen('php://memory', 'r+');
-
- fwrite($inputStream, <<<ICS
-BEGIN:VCARD
-VERSION:3.0
-FN:Cowboy Henk
-END:VCARD
-ICS
- );
- rewind($inputStream);
- $this->cli->stdin = $inputStream;
-
- $this->assertEquals(
- 0,
- $this->cli->main(['vobject', 'convert', '--format=json', '-'])
- );
-
- rewind($this->cli->stdout);
- $version = Version::VERSION;
- $this->assertEquals(
- '["vcard",[["version",{},"text","4.0"],["prodid",{},"text","-\/\/Sabre\/\/Sabre VObject ' . $version . '\/\/EN"],["fn",{},"text","Cowboy Henk"]]]',
- stream_get_contents($this->cli->stdout)
- );
-
- }
-
- function testConvertJCardPretty() {
-
- if (version_compare(PHP_VERSION, '5.4.0') < 0) {
- $this->markTestSkipped('This test required PHP 5.4.0');
- }
-
- $inputStream = fopen('php://memory', 'r+');
-
- fwrite($inputStream, <<<ICS
-BEGIN:VCARD
-VERSION:3.0
-FN:Cowboy Henk
-END:VCARD
-ICS
- );
- rewind($inputStream);
- $this->cli->stdin = $inputStream;
-
- $this->assertEquals(
- 0,
- $this->cli->main(['vobject', 'convert', '--format=jcard', '--pretty', '-'])
- );
-
- rewind($this->cli->stdout);
-
- // PHP 5.5.12 changed the output
-
- $expected = <<<JCARD
-[
- "vcard",
- [
- [
- "versi
-JCARD;
-
- $this->assertStringStartsWith(
- $expected,
- stream_get_contents($this->cli->stdout)
- );
-
- }
-
- function testConvertJCalFail() {
-
- $inputStream = fopen('php://memory', 'r+');
-
- fwrite($inputStream, <<<ICS
-BEGIN:VCARD
-VERSION:3.0
-FN:Cowboy Henk
-END:VCARD
-ICS
- );
- rewind($inputStream);
- $this->cli->stdin = $inputStream;
-
- $this->assertEquals(
- 2,
- $this->cli->main(['vobject', 'convert', '--format=jcal', '--inputformat=mimedir', '-'])
- );
-
- }
-
- function testConvertMimeDir() {
-
- $inputStream = fopen('php://memory', 'r+');
-
- fwrite($inputStream, <<<JCARD
-[
- "vcard",
- [
- [
- "version",
- {
-
- },
- "text",
- "4.0"
- ],
- [
- "prodid",
- {
-
- },
- "text",
- "-\/\/Sabre\/\/Sabre VObject 3.1.0\/\/EN"
- ],
- [
- "fn",
- {
-
- },
- "text",
- "Cowboy Henk"
- ]
- ]
-]
-JCARD
- );
- rewind($inputStream);
- $this->cli->stdin = $inputStream;
-
- $this->assertEquals(
- 0,
- $this->cli->main(['vobject', 'convert', '--format=mimedir', '--inputformat=json', '--pretty', '-'])
- );
-
- rewind($this->cli->stdout);
- $expected = <<<VCF
-BEGIN:VCARD
-VERSION:4.0
-PRODID:-//Sabre//Sabre VObject 3.1.0//EN
-FN:Cowboy Henk
-END:VCARD
-
-VCF;
-
- $this->assertEquals(
- strtr($expected, ["\n" => "\r\n"]),
- stream_get_contents($this->cli->stdout)
- );
-
- }
-
- function testConvertDefaultFormats() {
-
- $outputFile = SABRE_TEMPDIR . 'bar.json';
-
- $this->assertEquals(
- 2,
- $this->cli->main(['vobject', 'convert', 'foo.json', $outputFile])
- );
-
- $this->assertEquals('json', $this->cli->inputFormat);
- $this->assertEquals('json', $this->cli->format);
-
- }
-
- function testConvertDefaultFormats2() {
-
- $outputFile = SABRE_TEMPDIR . 'bar.ics';
-
- $this->assertEquals(
- 2,
- $this->cli->main(['vobject', 'convert', 'foo.ics', $outputFile])
- );
-
- $this->assertEquals('mimedir', $this->cli->inputFormat);
- $this->assertEquals('mimedir', $this->cli->format);
-
- }
-
- function testVCard3040() {
-
- $inputStream = fopen('php://memory', 'r+');
-
- fwrite($inputStream, <<<VCARD
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Sabre//Sabre VObject 3.1.0//EN
-FN:Cowboy Henk
-END:VCARD
-
-VCARD
- );
- rewind($inputStream);
- $this->cli->stdin = $inputStream;
-
- $this->assertEquals(
- 0,
- $this->cli->main(['vobject', 'convert', '--format=vcard40', '--pretty', '-'])
- );
-
- rewind($this->cli->stdout);
-
- $version = Version::VERSION;
- $expected = <<<VCF
-BEGIN:VCARD
-VERSION:4.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-FN:Cowboy Henk
-END:VCARD
-
-VCF;
-
- $this->assertEquals(
- strtr($expected, ["\n" => "\r\n"]),
- stream_get_contents($this->cli->stdout)
- );
-
- }
-
- function testVCard4030() {
-
- $inputStream = fopen('php://memory', 'r+');
-
- fwrite($inputStream, <<<VCARD
-BEGIN:VCARD
-VERSION:4.0
-PRODID:-//Sabre//Sabre VObject 3.1.0//EN
-FN:Cowboy Henk
-END:VCARD
-
-VCARD
- );
- rewind($inputStream);
- $this->cli->stdin = $inputStream;
-
- $this->assertEquals(
- 0,
- $this->cli->main(['vobject', 'convert', '--format=vcard30', '--pretty', '-'])
- );
-
- $version = Version::VERSION;
-
- rewind($this->cli->stdout);
- $expected = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-FN:Cowboy Henk
-END:VCARD
-
-VCF;
-
- $this->assertEquals(
- strtr($expected, ["\n" => "\r\n"]),
- stream_get_contents($this->cli->stdout)
- );
-
- }
-
- function testVCard4021() {
-
- $inputStream = fopen('php://memory', 'r+');
-
- fwrite($inputStream, <<<VCARD
-BEGIN:VCARD
-VERSION:4.0
-PRODID:-//Sabre//Sabre VObject 3.1.0//EN
-FN:Cowboy Henk
-END:VCARD
-
-VCARD
- );
- rewind($inputStream);
- $this->cli->stdin = $inputStream;
-
- $this->assertEquals(
- 2,
- $this->cli->main(['vobject', 'convert', '--format=vcard21', '--pretty', '-'])
- );
-
- }
-
- function testValidate() {
-
- $inputStream = fopen('php://memory', 'r+');
-
- fwrite($inputStream, <<<VCARD
-BEGIN:VCARD
-VERSION:4.0
-PRODID:-//Sabre//Sabre VObject 3.1.0//EN
-UID:foo
-FN:Cowboy Henk
-END:VCARD
-
-VCARD
- );
- rewind($inputStream);
- $this->cli->stdin = $inputStream;
- $result = $this->cli->main(['vobject', 'validate', '-']);
-
- $this->assertEquals(
- 0,
- $result
- );
-
- }
-
- function testValidateFail() {
-
- $inputStream = fopen('php://memory', 'r+');
-
- fwrite($inputStream, <<<VCARD
-BEGIN:VCALENDAR
-VERSION:2.0
-END:VCARD
-
-VCARD
- );
- rewind($inputStream);
- $this->cli->stdin = $inputStream;
- // vCard 2.0 is not supported yet, so this returns a failure.
- $this->assertEquals(
- 2,
- $this->cli->main(['vobject', 'validate', '-'])
- );
-
- }
-
- function testValidateFail2() {
-
- $inputStream = fopen('php://memory', 'r+');
-
- fwrite($inputStream, <<<VCARD
-BEGIN:VCALENDAR
-VERSION:5.0
-END:VCALENDAR
-
-VCARD
- );
- rewind($inputStream);
- $this->cli->stdin = $inputStream;
-
- $this->assertEquals(
- 2,
- $this->cli->main(['vobject', 'validate', '-'])
- );
-
- }
-
- function testRepair() {
-
- $inputStream = fopen('php://memory', 'r+');
-
- fwrite($inputStream, <<<VCARD
-BEGIN:VCARD
-VERSION:5.0
-END:VCARD
-
-VCARD
- );
- rewind($inputStream);
- $this->cli->stdin = $inputStream;
-
- $this->assertEquals(
- 2,
- $this->cli->main(['vobject', 'repair', '-'])
- );
-
- rewind($this->cli->stdout);
- $this->assertRegExp("/^BEGIN:VCARD\r\nVERSION:2.1\r\nUID:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\r\nEND:VCARD\r\n$/", stream_get_contents($this->cli->stdout));
- }
-
- function testRepairNothing() {
-
- $inputStream = fopen('php://memory', 'r+');
-
- fwrite($inputStream, <<<VCARD
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject 3.1.0//EN
-BEGIN:VEVENT
-UID:foo
-DTSTAMP:20140122T233226Z
-DTSTART:20140101T120000Z
-END:VEVENT
-END:VCALENDAR
-
-VCARD
- );
- rewind($inputStream);
- $this->cli->stdin = $inputStream;
-
- $result = $this->cli->main(['vobject', 'repair', '-']);
-
- rewind($this->cli->stderr);
- $error = stream_get_contents($this->cli->stderr);
-
- $this->assertEquals(
- 0,
- $result,
- "This should have been error free. stderr output:\n" . $error
- );
-
- }
-
- /**
- * Note: this is a very shallow test, doesn't dig into the actual output,
- * but just makes sure there's no errors thrown.
- *
- * The colorizer is not a critical component, it's mostly a debugging tool.
- */
- function testColorCalendar() {
-
- $inputStream = fopen('php://memory', 'r+');
-
- $version = Version::VERSION;
-
- /**
- * This object is not valid, but it's designed to hit every part of the
- * colorizer source.
- */
- fwrite($inputStream, <<<VCARD
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject {$version}//EN
-BEGIN:VTIMEZONE
-END:VTIMEZONE
-BEGIN:VEVENT
-ATTENDEE;RSVP=TRUE:mailto:foo@example.org
-REQUEST-STATUS:5;foo
-ATTACH:blabla
-END:VEVENT
-END:VCALENDAR
-
-VCARD
- );
- rewind($inputStream);
- $this->cli->stdin = $inputStream;
-
- $result = $this->cli->main(['vobject', 'color', '-']);
-
- rewind($this->cli->stderr);
- $error = stream_get_contents($this->cli->stderr);
-
- $this->assertEquals(
- 0,
- $result,
- "This should have been error free. stderr output:\n" . $error
- );
-
- }
-
- /**
- * Note: this is a very shallow test, doesn't dig into the actual output,
- * but just makes sure there's no errors thrown.
- *
- * The colorizer is not a critical component, it's mostly a debugging tool.
- */
- function testColorVCard() {
-
- $inputStream = fopen('php://memory', 'r+');
-
- $version = Version::VERSION;
-
- /**
- * This object is not valid, but it's designed to hit every part of the
- * colorizer source.
- */
- fwrite($inputStream, <<<VCARD
-BEGIN:VCARD
-VERSION:4.0
-PRODID:-//Sabre//Sabre VObject {$version}//EN
-ADR:1;2;3;4a,4b;5;6
-group.TEL:123454768
-END:VCARD
-
-VCARD
- );
- rewind($inputStream);
- $this->cli->stdin = $inputStream;
-
- $result = $this->cli->main(['vobject', 'color', '-']);
-
- rewind($this->cli->stderr);
- $error = stream_get_contents($this->cli->stderr);
-
- $this->assertEquals(
- 0,
- $result,
- "This should have been error free. stderr output:\n" . $error
- );
-
- }
-}
-
-class CliMock extends Cli {
-
- public $quiet = false;
-
- public $format;
-
- public $pretty;
-
- public $stdin;
-
- public $stdout;
-
- public $stderr;
-
- public $inputFormat;
-
- public $outputFormat;
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/AvailableTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/AvailableTest.php
deleted file mode 100644
index a13f67ac23b..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/AvailableTest.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use DateTimeImmutable;
-use DateTimeZone;
-use Sabre\VObject\Reader;
-
-/**
- * We use `RFCxxx` has a placeholder for the
- * https://tools.ietf.org/html/draft-daboo-calendar-availability-05 name.
- */
-class AvailableTest extends \PHPUnit_Framework_TestCase {
-
- function testAvailableComponent() {
-
- $vcal = <<<VCAL
-BEGIN:VCALENDAR
-BEGIN:AVAILABLE
-END:AVAILABLE
-END:VCALENDAR
-VCAL;
- $document = Reader::read($vcal);
- $this->assertInstanceOf(__NAMESPACE__ . '\Available', $document->AVAILABLE);
-
- }
-
- function testGetEffectiveStartEnd() {
-
- $vcal = <<<VCAL
-BEGIN:VCALENDAR
-BEGIN:AVAILABLE
-DTSTART:20150717T162200Z
-DTEND:20150717T172200Z
-END:AVAILABLE
-END:VCALENDAR
-VCAL;
-
- $document = Reader::read($vcal);
- $tz = new DateTimeZone('UTC');
- $this->assertEquals(
- [
- new DateTimeImmutable('2015-07-17 16:22:00', $tz),
- new DateTimeImmutable('2015-07-17 17:22:00', $tz),
- ],
- $document->AVAILABLE->getEffectiveStartEnd()
- );
-
- }
-
- function testGetEffectiveStartEndDuration() {
-
- $vcal = <<<VCAL
-BEGIN:VCALENDAR
-BEGIN:AVAILABLE
-DTSTART:20150717T162200Z
-DURATION:PT1H
-END:AVAILABLE
-END:VCALENDAR
-VCAL;
-
- $document = Reader::read($vcal);
- $tz = new DateTimeZone('UTC');
- $this->assertEquals(
- [
- new DateTimeImmutable('2015-07-17 16:22:00', $tz),
- new DateTimeImmutable('2015-07-17 17:22:00', $tz),
- ],
- $document->AVAILABLE->getEffectiveStartEnd()
- );
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VAlarmTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VAlarmTest.php
deleted file mode 100644
index b398e71e824..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VAlarmTest.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use DateTime;
-use Sabre\VObject\Reader;
-
-class VAlarmTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * @dataProvider timeRangeTestData
- */
- function testInTimeRange(VAlarm $valarm, $start, $end, $outcome) {
-
- $this->assertEquals($outcome, $valarm->isInTimeRange($start, $end));
-
- }
-
- function timeRangeTestData() {
-
- $tests = [];
-
- $calendar = new VCalendar();
-
- // Hard date and time
- $valarm1 = $calendar->createComponent('VALARM');
- $valarm1->add(
- $calendar->createProperty('TRIGGER', '20120312T130000Z', ['VALUE' => 'DATE-TIME'])
- );
-
- $tests[] = [$valarm1, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-04-01 01:00:00'), true];
- $tests[] = [$valarm1, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-03-10 01:00:00'), false];
-
- // Relation to start time of event
- $valarm2 = $calendar->createComponent('VALARM');
- $valarm2->add(
- $calendar->createProperty('TRIGGER', '-P1D', ['VALUE' => 'DURATION'])
- );
-
- $vevent2 = $calendar->createComponent('VEVENT');
- $vevent2->DTSTART = '20120313T130000Z';
- $vevent2->add($valarm2);
-
- $tests[] = [$valarm2, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-04-01 01:00:00'), true];
- $tests[] = [$valarm2, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-03-10 01:00:00'), false];
-
- // Relation to end time of event
- $valarm3 = $calendar->createComponent('VALARM');
- $valarm3->add($calendar->createProperty('TRIGGER', '-P1D', ['VALUE' => 'DURATION', 'RELATED' => 'END']));
-
- $vevent3 = $calendar->createComponent('VEVENT');
- $vevent3->DTSTART = '20120301T130000Z';
- $vevent3->DTEND = '20120401T130000Z';
- $vevent3->add($valarm3);
-
- $tests[] = [$valarm3, new DateTime('2012-02-25 01:00:00'), new DateTime('2012-03-05 01:00:00'), false];
- $tests[] = [$valarm3, new DateTime('2012-03-25 01:00:00'), new DateTime('2012-04-05 01:00:00'), true];
-
- // Relation to end time of todo
- $valarm4 = $calendar->createComponent('VALARM');
- $valarm4->TRIGGER = '-P1D';
- $valarm4->TRIGGER['VALUE'] = 'DURATION';
- $valarm4->TRIGGER['RELATED'] = 'END';
-
- $vtodo4 = $calendar->createComponent('VTODO');
- $vtodo4->DTSTART = '20120301T130000Z';
- $vtodo4->DUE = '20120401T130000Z';
- $vtodo4->add($valarm4);
-
- $tests[] = [$valarm4, new DateTime('2012-02-25 01:00:00'), new DateTime('2012-03-05 01:00:00'), false];
- $tests[] = [$valarm4, new DateTime('2012-03-25 01:00:00'), new DateTime('2012-04-05 01:00:00'), true];
-
- // Relation to start time of event + repeat
- $valarm5 = $calendar->createComponent('VALARM');
- $valarm5->TRIGGER = '-P1D';
- $valarm5->TRIGGER['VALUE'] = 'DURATION';
- $valarm5->REPEAT = 10;
- $valarm5->DURATION = 'P1D';
-
- $vevent5 = $calendar->createComponent('VEVENT');
- $vevent5->DTSTART = '20120301T130000Z';
- $vevent5->add($valarm5);
-
- $tests[] = [$valarm5, new DateTime('2012-03-09 01:00:00'), new DateTime('2012-03-10 01:00:00'), true];
-
- // Relation to start time of event + duration, but no repeat
- $valarm6 = $calendar->createComponent('VALARM');
- $valarm6->TRIGGER = '-P1D';
- $valarm6->TRIGGER['VALUE'] = 'DURATION';
- $valarm6->DURATION = 'P1D';
-
- $vevent6 = $calendar->createComponent('VEVENT');
- $vevent6->DTSTART = '20120313T130000Z';
- $vevent6->add($valarm6);
-
- $tests[] = [$valarm6, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-04-01 01:00:00'), true];
- $tests[] = [$valarm6, new DateTime('2012-03-01 01:00:00'), new DateTime('2012-03-10 01:00:00'), false];
-
-
- // Relation to end time of event (DURATION instead of DTEND)
- $valarm7 = $calendar->createComponent('VALARM');
- $valarm7->TRIGGER = '-P1D';
- $valarm7->TRIGGER['VALUE'] = 'DURATION';
- $valarm7->TRIGGER['RELATED'] = 'END';
-
- $vevent7 = $calendar->createComponent('VEVENT');
- $vevent7->DTSTART = '20120301T130000Z';
- $vevent7->DURATION = 'P30D';
- $vevent7->add($valarm7);
-
- $tests[] = [$valarm7, new DateTime('2012-02-25 01:00:00'), new DateTime('2012-03-05 01:00:00'), false];
- $tests[] = [$valarm7, new DateTime('2012-03-25 01:00:00'), new DateTime('2012-04-05 01:00:00'), true];
-
- // Relation to end time of event (No DTEND or DURATION)
- $valarm7 = $calendar->createComponent('VALARM');
- $valarm7->TRIGGER = '-P1D';
- $valarm7->TRIGGER['VALUE'] = 'DURATION';
- $valarm7->TRIGGER['RELATED'] = 'END';
-
- $vevent7 = $calendar->createComponent('VEVENT');
- $vevent7->DTSTART = '20120301T130000Z';
- $vevent7->add($valarm7);
-
- $tests[] = [$valarm7, new DateTime('2012-02-25 01:00:00'), new DateTime('2012-03-05 01:00:00'), true];
- $tests[] = [$valarm7, new DateTime('2012-03-25 01:00:00'), new DateTime('2012-04-05 01:00:00'), false];
-
-
- return $tests;
- }
-
- /**
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testInTimeRangeInvalidComponent() {
-
- $calendar = new VCalendar();
- $valarm = $calendar->createComponent('VALARM');
- $valarm->TRIGGER = '-P1D';
- $valarm->TRIGGER['RELATED'] = 'END';
-
- $vjournal = $calendar->createComponent('VJOURNAL');
- $vjournal->add($valarm);
-
- $valarm->isInTimeRange(new DateTime('2012-02-25 01:00:00'), new DateTime('2012-03-05 01:00:00'));
-
- }
-
- /**
- * This bug was found and reported on the mailing list.
- */
- function testInTimeRangeBuggy() {
-
-$input = <<<BLA
-BEGIN:VCALENDAR
-BEGIN:VTODO
-DTSTAMP:20121003T064931Z
-UID:b848cb9a7bb16e464a06c222ca1f8102@examle.com
-STATUS:NEEDS-ACTION
-DUE:20121005T000000Z
-SUMMARY:Task 1
-CATEGORIES:AlarmCategory
-BEGIN:VALARM
-TRIGGER:-PT10M
-ACTION:DISPLAY
-DESCRIPTION:Task 1
-END:VALARM
-END:VTODO
-END:VCALENDAR
-BLA;
-
- $vobj = Reader::read($input);
-
- $this->assertTrue($vobj->VTODO->VALARM->isInTimeRange(new \DateTime('2012-10-01 00:00:00'), new \DateTime('2012-11-01 00:00:00')));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VAvailabilityTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VAvailabilityTest.php
deleted file mode 100644
index 021100ecb88..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VAvailabilityTest.php
+++ /dev/null
@@ -1,490 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use DateTimeImmutable;
-use DateTimeZone;
-use Sabre\VObject;
-use Sabre\VObject\Reader;
-
-/**
- * We use `RFCxxx` has a placeholder for the
- * https://tools.ietf.org/html/draft-daboo-calendar-availability-05 name.
- */
-class VAvailabilityTest extends \PHPUnit_Framework_TestCase {
-
- function testVAvailabilityComponent() {
-
- $vcal = <<<VCAL
-BEGIN:VCALENDAR
-BEGIN:VAVAILABILITY
-END:VAVAILABILITY
-END:VCALENDAR
-VCAL;
- $document = Reader::read($vcal);
-
- $this->assertInstanceOf(__NAMESPACE__ . '\VAvailability', $document->VAVAILABILITY);
-
- }
-
- function testGetEffectiveStartEnd() {
-
- $vcal = <<<VCAL
-BEGIN:VCALENDAR
-BEGIN:VAVAILABILITY
-DTSTART:20150717T162200Z
-DTEND:20150717T172200Z
-END:VAVAILABILITY
-END:VCALENDAR
-VCAL;
-
- $document = Reader::read($vcal);
- $tz = new DateTimeZone('UTC');
- $this->assertEquals(
- [
- new DateTimeImmutable('2015-07-17 16:22:00', $tz),
- new DateTimeImmutable('2015-07-17 17:22:00', $tz),
- ],
- $document->VAVAILABILITY->getEffectiveStartEnd()
- );
-
- }
-
- function testGetEffectiveStartDuration() {
-
- $vcal = <<<VCAL
-BEGIN:VCALENDAR
-BEGIN:VAVAILABILITY
-DTSTART:20150717T162200Z
-DURATION:PT1H
-END:VAVAILABILITY
-END:VCALENDAR
-VCAL;
-
- $document = Reader::read($vcal);
- $tz = new DateTimeZone('UTC');
- $this->assertEquals(
- [
- new DateTimeImmutable('2015-07-17 16:22:00', $tz),
- new DateTimeImmutable('2015-07-17 17:22:00', $tz),
- ],
- $document->VAVAILABILITY->getEffectiveStartEnd()
- );
-
- }
-
- function testGetEffectiveStartEndUnbound() {
-
- $vcal = <<<VCAL
-BEGIN:VCALENDAR
-BEGIN:VAVAILABILITY
-END:VAVAILABILITY
-END:VCALENDAR
-VCAL;
-
- $document = Reader::read($vcal);
- $this->assertEquals(
- [
- null,
- null,
- ],
- $document->VAVAILABILITY->getEffectiveStartEnd()
- );
-
- }
-
- function testIsInTimeRangeUnbound() {
-
- $vcal = <<<VCAL
-BEGIN:VCALENDAR
-BEGIN:VAVAILABILITY
-END:VAVAILABILITY
-END:VCALENDAR
-VCAL;
-
- $document = Reader::read($vcal);
- $this->assertTrue(
- $document->VAVAILABILITY->isInTimeRange(new DateTimeImmutable('2015-07-17'), new DateTimeImmutable('2015-07-18'))
- );
-
- }
-
- function testIsInTimeRangeOutside() {
-
- $vcal = <<<VCAL
-BEGIN:VCALENDAR
-BEGIN:VAVAILABILITY
-DTSTART:20140101T000000Z
-DTEND:20140102T000000Z
-END:VAVAILABILITY
-END:VCALENDAR
-VCAL;
-
- $document = Reader::read($vcal);
- $this->assertFalse(
- $document->VAVAILABILITY->isInTimeRange(new DateTimeImmutable('2015-07-17'), new DateTimeImmutable('2015-07-18'))
- );
-
- }
-
- function testRFCxxxSection3_1_availabilityprop_required() {
-
- // UID and DTSTAMP are present.
- $this->assertIsValid(Reader::read(
-<<<VCAL
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//id
-BEGIN:VAVAILABILITY
-UID:foo@test
-DTSTAMP:20111005T133225Z
-END:VAVAILABILITY
-END:VCALENDAR
-VCAL
- ));
-
- // UID and DTSTAMP are missing.
- $this->assertIsNotValid(Reader::read(
-<<<VCAL
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//id
-BEGIN:VAVAILABILITY
-END:VAVAILABILITY
-END:VCALENDAR
-VCAL
- ));
-
- // DTSTAMP is missing.
- $this->assertIsNotValid(Reader::read(
-<<<VCAL
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//id
-BEGIN:VAVAILABILITY
-UID:foo@test
-END:VAVAILABILITY
-END:VCALENDAR
-VCAL
- ));
-
- // UID is missing.
- $this->assertIsNotValid(Reader::read(
-<<<VCAL
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//id
-BEGIN:VAVAILABILITY
-DTSTAMP:20111005T133225Z
-END:VAVAILABILITY
-END:VCALENDAR
-VCAL
- ));
-
- }
-
- function testRFCxxxSection3_1_availabilityprop_optional_once() {
-
- $properties = [
- 'BUSYTYPE:BUSY',
- 'CLASS:PUBLIC',
- 'CREATED:20111005T135125Z',
- 'DESCRIPTION:Long bla bla',
- 'DTSTART:20111005T020000',
- 'LAST-MODIFIED:20111005T135325Z',
- 'ORGANIZER:mailto:foo@example.com',
- 'PRIORITY:1',
- 'SEQUENCE:0',
- 'SUMMARY:Bla bla',
- 'URL:http://example.org/'
- ];
-
- // They are all present, only once.
- $this->assertIsValid(Reader::read($this->template($properties)));
-
- // We duplicate each one to see if it fails.
- foreach ($properties as $property) {
- $this->assertIsNotValid(Reader::read($this->template([
- $property,
- $property
- ])));
- }
-
- }
-
- function testRFCxxxSection3_1_availabilityprop_dtend_duration() {
-
- // Only DTEND.
- $this->assertIsValid(Reader::read($this->template([
- 'DTEND:21111005T133225Z'
- ])));
-
- // Only DURATION.
- $this->assertIsValid(Reader::read($this->template([
- 'DURATION:PT1H'
- ])));
-
- // Both (not allowed).
- $this->assertIsNotValid(Reader::read($this->template([
- 'DTEND:21111005T133225Z',
- 'DURATION:PT1H'
- ])));
- }
-
- function testAvailableSubComponent() {
-
- $vcal = <<<VCAL
-BEGIN:VCALENDAR
-BEGIN:VAVAILABILITY
-BEGIN:AVAILABLE
-END:AVAILABLE
-END:VAVAILABILITY
-END:VCALENDAR
-VCAL;
- $document = Reader::read($vcal);
-
- $this->assertInstanceOf(__NAMESPACE__, $document->VAVAILABILITY->AVAILABLE);
-
- }
-
- function testRFCxxxSection3_1_availableprop_required() {
-
- // UID, DTSTAMP and DTSTART are present.
- $this->assertIsValid(Reader::read(
-<<<VCAL
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//id
-BEGIN:VAVAILABILITY
-UID:foo@test
-DTSTAMP:20111005T133225Z
-BEGIN:AVAILABLE
-UID:foo@test
-DTSTAMP:20111005T133225Z
-DTSTART:20111005T133225Z
-END:AVAILABLE
-END:VAVAILABILITY
-END:VCALENDAR
-VCAL
- ));
-
- // UID, DTSTAMP and DTSTART are missing.
- $this->assertIsNotValid(Reader::read(
-<<<VCAL
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//id
-BEGIN:VAVAILABILITY
-UID:foo@test
-DTSTAMP:20111005T133225Z
-BEGIN:AVAILABLE
-END:AVAILABLE
-END:VAVAILABILITY
-END:VCALENDAR
-VCAL
- ));
-
- // UID is missing.
- $this->assertIsNotValid(Reader::read(
-<<<VCAL
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//id
-BEGIN:VAVAILABILITY
-UID:foo@test
-DTSTAMP:20111005T133225Z
-BEGIN:AVAILABLE
-DTSTAMP:20111005T133225Z
-DTSTART:20111005T133225Z
-END:AVAILABLE
-END:VAVAILABILITY
-END:VCALENDAR
-VCAL
- ));
-
- // DTSTAMP is missing.
- $this->assertIsNotValid(Reader::read(
-<<<VCAL
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//id
-BEGIN:VAVAILABILITY
-UID:foo@test
-DTSTAMP:20111005T133225Z
-BEGIN:AVAILABLE
-UID:foo@test
-DTSTART:20111005T133225Z
-END:AVAILABLE
-END:VAVAILABILITY
-END:VCALENDAR
-VCAL
- ));
-
- // DTSTART is missing.
- $this->assertIsNotValid(Reader::read(
-<<<VCAL
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//id
-BEGIN:VAVAILABILITY
-UID:foo@test
-DTSTAMP:20111005T133225Z
-BEGIN:AVAILABLE
-UID:foo@test
-DTSTAMP:20111005T133225Z
-END:AVAILABLE
-END:VAVAILABILITY
-END:VCALENDAR
-VCAL
- ));
-
- }
-
- function testRFCxxxSection3_1_available_dtend_duration() {
-
- // Only DTEND.
- $this->assertIsValid(Reader::read($this->templateAvailable([
- 'DTEND:21111005T133225Z'
- ])));
-
- // Only DURATION.
- $this->assertIsValid(Reader::read($this->templateAvailable([
- 'DURATION:PT1H'
- ])));
-
- // Both (not allowed).
- $this->assertIsNotValid(Reader::read($this->templateAvailable([
- 'DTEND:21111005T133225Z',
- 'DURATION:PT1H'
- ])));
- }
-
- function testRFCxxxSection3_1_available_optional_once() {
-
- $properties = [
- 'CREATED:20111005T135125Z',
- 'DESCRIPTION:Long bla bla',
- 'LAST-MODIFIED:20111005T135325Z',
- 'RECURRENCE-ID;RANGE=THISANDFUTURE:19980401T133000Z',
- 'RRULE:FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR',
- 'SUMMARY:Bla bla'
- ];
-
- // They are all present, only once.
- $this->assertIsValid(Reader::read($this->templateAvailable($properties)));
-
- // We duplicate each one to see if it fails.
- foreach ($properties as $property) {
- $this->assertIsNotValid(Reader::read($this->templateAvailable([
- $property,
- $property
- ])));
- }
-
- }
- function testRFCxxxSection3_2() {
-
- $this->assertEquals(
- 'BUSY',
- Reader::read($this->templateAvailable([
- 'BUSYTYPE:BUSY'
- ]))
- ->VAVAILABILITY
- ->AVAILABLE
- ->BUSYTYPE
- ->getValue()
- );
-
- $this->assertEquals(
- 'BUSY-UNAVAILABLE',
- Reader::read($this->templateAvailable([
- 'BUSYTYPE:BUSY-UNAVAILABLE'
- ]))
- ->VAVAILABILITY
- ->AVAILABLE
- ->BUSYTYPE
- ->getValue()
- );
-
- $this->assertEquals(
- 'BUSY-TENTATIVE',
- Reader::read($this->templateAvailable([
- 'BUSYTYPE:BUSY-TENTATIVE'
- ]))
- ->VAVAILABILITY
- ->AVAILABLE
- ->BUSYTYPE
- ->getValue()
- );
-
- }
-
- protected function assertIsValid(VObject\Document $document) {
-
- $validationResult = $document->validate();
- if ($validationResult) {
- $messages = array_map(function($item) { return $item['message']; }, $validationResult);
- $this->fail('Failed to assert that the supplied document is a valid document. Validation messages: ' . implode(', ', $messages));
- }
- $this->assertEmpty($document->validate());
-
- }
-
- protected function assertIsNotValid(VObject\Document $document) {
-
- $this->assertNotEmpty($document->validate());
-
- }
-
- protected function template(array $properties) {
-
- return $this->_template(
- <<<VCAL
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//id
-BEGIN:VAVAILABILITY
-UID:foo@test
-DTSTAMP:20111005T133225Z
-…
-END:VAVAILABILITY
-END:VCALENDAR
-VCAL
-,
- $properties
- );
-
- }
-
- protected function templateAvailable(array $properties) {
-
- return $this->_template(
- <<<VCAL
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//id
-BEGIN:VAVAILABILITY
-UID:foo@test
-DTSTAMP:20111005T133225Z
-BEGIN:AVAILABLE
-UID:foo@test
-DTSTAMP:20111005T133225Z
-DTSTART:20111005T133225Z
-…
-END:AVAILABLE
-END:VAVAILABILITY
-END:VCALENDAR
-VCAL
-,
- $properties
- );
-
- }
-
- protected function _template($template, array $properties) {
-
- return str_replace('…', implode("\r\n", $properties), $template);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VCalendarTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VCalendarTest.php
deleted file mode 100644
index abb387d9572..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VCalendarTest.php
+++ /dev/null
@@ -1,782 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use DateTimeZone;
-use Sabre\VObject;
-
-class VCalendarTest extends \PHPUnit_Framework_TestCase {
-
- use VObject\PHPUnitAssertions;
-
- /**
- * @dataProvider expandData
- */
- function testExpand($input, $output, $timeZone = 'UTC', $start = '2011-12-01', $end = '2011-12-31') {
-
- $vcal = VObject\Reader::read($input);
-
- $timeZone = new DateTimeZone($timeZone);
-
- $vcal = $vcal->expand(
- new \DateTime($start),
- new \DateTime($end),
- $timeZone
- );
-
- // This will normalize the output
- $output = VObject\Reader::read($output)->serialize();
-
- $this->assertVObjectEqualsVObject($output, $vcal->serialize());
-
- }
-
- function expandData() {
-
- $tests = [];
-
- // No data
- $input = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-END:VCALENDAR
-';
-
- $output = $input;
- $tests[] = [$input,$output];
-
-
- // Simple events
- $input = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VEVENT
-UID:bla
-SUMMARY:InExpand
-DTSTART;VALUE=DATE:20111202
-END:VEVENT
-BEGIN:VEVENT
-UID:bla2
-SUMMARY:NotInExpand
-DTSTART;VALUE=DATE:20120101
-END:VEVENT
-END:VCALENDAR
-';
-
- $output = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VEVENT
-UID:bla
-SUMMARY:InExpand
-DTSTART;VALUE=DATE:20111202
-END:VEVENT
-END:VCALENDAR
-';
-
- $tests[] = [$input, $output];
-
- // Removing timezone info
- $input = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Paris
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:bla4
-SUMMARY:RemoveTZ info
-DTSTART;TZID=Europe/Paris:20111203T130102
-END:VEVENT
-END:VCALENDAR
-';
-
- $output = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VEVENT
-UID:bla4
-SUMMARY:RemoveTZ info
-DTSTART:20111203T120102Z
-END:VEVENT
-END:VCALENDAR
-';
-
- $tests[] = [$input, $output];
-
- // Removing timezone info from sub-components. See Issue #278
- $input = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:Europe/Paris
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:bla4
-SUMMARY:RemoveTZ info
-DTSTART;TZID=Europe/Paris:20111203T130102
-BEGIN:VALARM
-TRIGGER;VALUE=DATE-TIME;TZID=America/New_York:20151209T133200
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-';
-
- $output = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VEVENT
-UID:bla4
-SUMMARY:RemoveTZ info
-DTSTART:20111203T120102Z
-BEGIN:VALARM
-TRIGGER;VALUE=DATE-TIME:20151209T183200Z
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-';
-
- $tests[] = [$input, $output];
-
- // Recurrence rule
- $input = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule
-DTSTART:20111125T120000Z
-DTEND:20111125T130000Z
-RRULE:FREQ=WEEKLY
-END:VEVENT
-END:VCALENDAR
-';
-
- $output = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule
-DTSTART:20111202T120000Z
-DTEND:20111202T130000Z
-RECURRENCE-ID:20111202T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule
-DTSTART:20111209T120000Z
-DTEND:20111209T130000Z
-RECURRENCE-ID:20111209T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule
-DTSTART:20111216T120000Z
-DTEND:20111216T130000Z
-RECURRENCE-ID:20111216T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule
-DTSTART:20111223T120000Z
-DTEND:20111223T130000Z
-RECURRENCE-ID:20111223T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule
-DTSTART:20111230T120000Z
-DTEND:20111230T130000Z
-RECURRENCE-ID:20111230T120000Z
-END:VEVENT
-END:VCALENDAR
-';
-
- $tests[] = [$input, $output];
-
- // Recurrence rule + override
- $input = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule2
-DTSTART:20111125T120000Z
-DTEND:20111125T130000Z
-RRULE:FREQ=WEEKLY
-END:VEVENT
-BEGIN:VEVENT
-UID:bla6
-RECURRENCE-ID:20111209T120000Z
-DTSTART:20111209T140000Z
-DTEND:20111209T150000Z
-SUMMARY:Override!
-END:VEVENT
-END:VCALENDAR
-';
-
- $output = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule2
-DTSTART:20111202T120000Z
-DTEND:20111202T130000Z
-RECURRENCE-ID:20111202T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:bla6
-RECURRENCE-ID:20111209T120000Z
-DTSTART:20111209T140000Z
-DTEND:20111209T150000Z
-SUMMARY:Override!
-END:VEVENT
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule2
-DTSTART:20111216T120000Z
-DTEND:20111216T130000Z
-RECURRENCE-ID:20111216T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule2
-DTSTART:20111223T120000Z
-DTEND:20111223T130000Z
-RECURRENCE-ID:20111223T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule2
-DTSTART:20111230T120000Z
-DTEND:20111230T130000Z
-RECURRENCE-ID:20111230T120000Z
-END:VEVENT
-END:VCALENDAR
-';
-
- $tests[] = [$input, $output];
-
- // Floating dates and times.
- $input = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:bla1
-DTSTART:20141112T195000
-END:VEVENT
-BEGIN:VEVENT
-UID:bla2
-DTSTART;VALUE=DATE:20141112
-END:VEVENT
-BEGIN:VEVENT
-UID:bla3
-DTSTART;VALUE=DATE:20141112
-RRULE:FREQ=DAILY;COUNT=2
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $output = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:bla1
-DTSTART:20141112T225000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:bla2
-DTSTART;VALUE=DATE:20141112
-END:VEVENT
-BEGIN:VEVENT
-UID:bla3
-DTSTART;VALUE=DATE:20141112
-RECURRENCE-ID;VALUE=DATE:20141112
-END:VEVENT
-BEGIN:VEVENT
-UID:bla3
-DTSTART;VALUE=DATE:20141113
-RECURRENCE-ID;VALUE=DATE:20141113
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $tests[] = [$input, $output, 'America/Argentina/Buenos_Aires', '2014-01-01', '2015-01-01'];
-
- // Recurrence rule with no valid instances
- $input = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VEVENT
-UID:bla6
-SUMMARY:Testing RRule3
-DTSTART:20111125T120000Z
-DTEND:20111125T130000Z
-RRULE:FREQ=WEEKLY;COUNT=1
-EXDATE:20111125T120000Z
-END:VEVENT
-END:VCALENDAR
-';
-
- $output = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-END:VCALENDAR
-';
-
- $tests[] = [$input, $output];
- return $tests;
-
- }
-
- /**
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testBrokenEventExpand() {
-
- $input = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VEVENT
-RRULE:FREQ=WEEKLY
-DTSTART;VALUE=DATE:20111202
-END:VEVENT
-END:VCALENDAR
-';
- $vcal = VObject\Reader::read($input);
- $vcal->expand(
- new \DateTime('2011-12-01'),
- new \DateTime('2011-12-31')
- );
-
- }
-
- function testGetDocumentType() {
-
- $vcard = new VCalendar();
- $vcard->VERSION = '2.0';
- $this->assertEquals(VCalendar::ICALENDAR20, $vcard->getDocumentType());
-
- }
-
- function testValidateCorrect() {
-
- $input = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-PRODID:foo
-BEGIN:VEVENT
-DTSTART;VALUE=DATE:20111202
-DTSTAMP:20140122T233226Z
-UID:foo
-END:VEVENT
-END:VCALENDAR
-';
-
- $vcal = VObject\Reader::read($input);
- $this->assertEquals([], $vcal->validate(), 'Got an error');
-
- }
-
- function testValidateNoVersion() {
-
- $input = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:foo
-BEGIN:VEVENT
-DTSTART;VALUE=DATE:20111202
-UID:foo
-DTSTAMP:20140122T234434Z
-END:VEVENT
-END:VCALENDAR
-';
-
- $vcal = VObject\Reader::read($input);
- $this->assertEquals(1, count($vcal->validate()));
-
- }
-
- function testValidateWrongVersion() {
-
- $input = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:3.0
-PRODID:foo
-BEGIN:VEVENT
-DTSTART;VALUE=DATE:20111202
-UID:foo
-DTSTAMP:20140122T234434Z
-END:VEVENT
-END:VCALENDAR
-';
-
- $vcal = VObject\Reader::read($input);
- $this->assertEquals(1, count($vcal->validate()));
-
- }
-
- function testValidateNoProdId() {
-
- $input = 'BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-VERSION:2.0
-BEGIN:VEVENT
-DTSTART;VALUE=DATE:20111202
-UID:foo
-DTSTAMP:20140122T234434Z
-END:VEVENT
-END:VCALENDAR
-';
-
- $vcal = VObject\Reader::read($input);
- $this->assertEquals(1, count($vcal->validate()));
-
- }
-
- function testValidateDoubleCalScale() {
-
- $input = 'BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:foo
-CALSCALE:GREGORIAN
-CALSCALE:GREGORIAN
-BEGIN:VEVENT
-DTSTART;VALUE=DATE:20111202
-UID:foo
-DTSTAMP:20140122T234434Z
-END:VEVENT
-END:VCALENDAR
-';
-
- $vcal = VObject\Reader::read($input);
- $this->assertEquals(1, count($vcal->validate()));
-
- }
-
- function testValidateDoubleMethod() {
-
- $input = 'BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:foo
-METHOD:REQUEST
-METHOD:REQUEST
-BEGIN:VEVENT
-DTSTART;VALUE=DATE:20111202
-UID:foo
-DTSTAMP:20140122T234434Z
-END:VEVENT
-END:VCALENDAR
-';
-
- $vcal = VObject\Reader::read($input);
- $this->assertEquals(1, count($vcal->validate()));
-
- }
-
- function testValidateTwoMasterEvents() {
-
- $input = 'BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:foo
-METHOD:REQUEST
-BEGIN:VEVENT
-DTSTART;VALUE=DATE:20111202
-UID:foo
-DTSTAMP:20140122T234434Z
-END:VEVENT
-BEGIN:VEVENT
-DTSTART;VALUE=DATE:20111202
-UID:foo
-DTSTAMP:20140122T234434Z
-END:VEVENT
-END:VCALENDAR
-';
-
- $vcal = VObject\Reader::read($input);
- $this->assertEquals(1, count($vcal->validate()));
-
- }
-
- function testValidateOneMasterEvent() {
-
- $input = 'BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:foo
-METHOD:REQUEST
-BEGIN:VEVENT
-DTSTART;VALUE=DATE:20111202
-UID:foo
-DTSTAMP:20140122T234434Z
-END:VEVENT
-BEGIN:VEVENT
-DTSTART;VALUE=DATE:20111202
-UID:foo
-DTSTAMP:20140122T234434Z
-RECURRENCE-ID;VALUE=DATE:20111202
-END:VEVENT
-END:VCALENDAR
-';
-
- $vcal = VObject\Reader::read($input);
- $this->assertEquals(0, count($vcal->validate()));
-
- }
-
- function testGetBaseComponent() {
-
- $input = 'BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:foo
-METHOD:REQUEST
-BEGIN:VEVENT
-SUMMARY:test
-DTSTART;VALUE=DATE:20111202
-UID:foo
-DTSTAMP:20140122T234434Z
-END:VEVENT
-BEGIN:VEVENT
-DTSTART;VALUE=DATE:20111202
-UID:foo
-DTSTAMP:20140122T234434Z
-RECURRENCE-ID;VALUE=DATE:20111202
-END:VEVENT
-END:VCALENDAR
-';
-
- $vcal = VObject\Reader::read($input);
-
- $result = $vcal->getBaseComponent();
- $this->assertEquals('test', $result->SUMMARY->getValue());
-
- }
-
- function testGetBaseComponentNoResult() {
-
- $input = 'BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:foo
-METHOD:REQUEST
-BEGIN:VEVENT
-SUMMARY:test
-RECURRENCE-ID;VALUE=DATE:20111202
-DTSTART;VALUE=DATE:20111202
-UID:foo
-DTSTAMP:20140122T234434Z
-END:VEVENT
-BEGIN:VEVENT
-DTSTART;VALUE=DATE:20111202
-UID:foo
-DTSTAMP:20140122T234434Z
-RECURRENCE-ID;VALUE=DATE:20111202
-END:VEVENT
-END:VCALENDAR
-';
-
- $vcal = VObject\Reader::read($input);
-
- $result = $vcal->getBaseComponent();
- $this->assertNull($result);
-
- }
-
- function testGetBaseComponentWithFilter() {
-
- $input = 'BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:foo
-METHOD:REQUEST
-BEGIN:VEVENT
-SUMMARY:test
-DTSTART;VALUE=DATE:20111202
-UID:foo
-DTSTAMP:20140122T234434Z
-END:VEVENT
-BEGIN:VEVENT
-DTSTART;VALUE=DATE:20111202
-UID:foo
-DTSTAMP:20140122T234434Z
-RECURRENCE-ID;VALUE=DATE:20111202
-END:VEVENT
-END:VCALENDAR
-';
-
- $vcal = VObject\Reader::read($input);
-
- $result = $vcal->getBaseComponent('VEVENT');
- $this->assertEquals('test', $result->SUMMARY->getValue());
-
- }
-
- function testGetBaseComponentWithFilterNoResult() {
-
- $input = 'BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:foo
-METHOD:REQUEST
-BEGIN:VTODO
-SUMMARY:test
-UID:foo
-DTSTAMP:20140122T234434Z
-END:VTODO
-END:VCALENDAR
-';
-
- $vcal = VObject\Reader::read($input);
-
- $result = $vcal->getBaseComponent('VEVENT');
- $this->assertNull($result);
-
- }
-
- function testNoComponents() {
-
- $input = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:vobject
-END:VCALENDAR
-ICS;
-
- $this->assertValidate(
- $input,
- 0,
- 3,
- "An iCalendar object must have at least 1 component."
- );
-
- }
-
- function testCalDAVNoComponents() {
-
- $input = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:vobject
-BEGIN:VTIMEZONE
-TZID:America/Toronto
-END:VTIMEZONE
-END:VCALENDAR
-ICS;
-
- $this->assertValidate(
- $input,
- VCalendar::PROFILE_CALDAV,
- 3,
- "A calendar object on a CalDAV server must have at least 1 component (VTODO, VEVENT, VJOURNAL)."
- );
-
- }
-
- function testCalDAVMultiUID() {
-
- $input = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:vobject
-BEGIN:VEVENT
-UID:foo
-DTSTAMP:20150109T184500Z
-DTSTART:20150109T184500Z
-END:VEVENT
-BEGIN:VEVENT
-UID:bar
-DTSTAMP:20150109T184500Z
-DTSTART:20150109T184500Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->assertValidate(
- $input,
- VCalendar::PROFILE_CALDAV,
- 3,
- "A calendar object on a CalDAV server may only have components with the same UID."
- );
-
- }
-
- function testCalDAVMultiComponent() {
-
- $input = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:vobject
-BEGIN:VEVENT
-UID:foo
-RECURRENCE-ID:20150109T185200Z
-DTSTAMP:20150109T184500Z
-DTSTART:20150109T184500Z
-END:VEVENT
-BEGIN:VTODO
-UID:foo
-DTSTAMP:20150109T184500Z
-DTSTART:20150109T184500Z
-END:VTODO
-END:VCALENDAR
-ICS;
-
- $this->assertValidate(
- $input,
- VCalendar::PROFILE_CALDAV,
- 3,
- "A calendar object on a CalDAV server may only have 1 type of component (VEVENT, VTODO or VJOURNAL)."
- );
-
- }
-
- function testCalDAVMETHOD() {
-
- $input = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-PRODID:vobject
-BEGIN:VEVENT
-UID:foo
-RECURRENCE-ID:20150109T185200Z
-DTSTAMP:20150109T184500Z
-DTSTART:20150109T184500Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->assertValidate(
- $input,
- VCalendar::PROFILE_CALDAV,
- 3,
- "A calendar object on a CalDAV server MUST NOT have a METHOD property."
- );
-
- }
-
- function assertValidate($ics, $options, $expectedLevel, $expectedMessage = null) {
-
- $vcal = VObject\Reader::read($ics);
- $result = $vcal->validate($options);
-
- $this->assertValidateResult($result, $expectedLevel, $expectedMessage);
-
- }
-
- function assertValidateResult($input, $expectedLevel, $expectedMessage = null) {
-
- $messages = [];
- foreach ($input as $warning) {
- $messages[] = $warning['message'];
- }
-
- if ($expectedLevel === 0) {
- $this->assertEquals(0, count($input), 'No validation messages were expected. We got: ' . implode(', ', $messages));
- } else {
- $this->assertEquals(1, count($input), 'We expected exactly 1 validation message, We got: ' . implode(', ', $messages));
-
- $this->assertEquals($expectedMessage, $input[0]['message']);
- $this->assertEquals($expectedLevel, $input[0]['level']);
- }
-
- }
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VCardTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VCardTest.php
deleted file mode 100644
index baa7f490d44..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VCardTest.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use Sabre\VObject;
-
-class VCardTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * @dataProvider validateData
- */
- function testValidate($input, $expectedWarnings, $expectedRepairedOutput) {
-
- $vcard = VObject\Reader::read($input);
-
- $warnings = $vcard->validate();
-
- $warnMsg = [];
- foreach ($warnings as $warning) {
- $warnMsg[] = $warning['message'];
- }
-
- $this->assertEquals($expectedWarnings, $warnMsg);
-
- $vcard->validate(VObject\Component::REPAIR);
-
- $this->assertEquals(
- $expectedRepairedOutput,
- $vcard->serialize()
- );
-
- }
-
- function validateData() {
-
- $tests = [];
-
- // Correct
- $tests[] = [
- "BEGIN:VCARD\r\nVERSION:4.0\r\nFN:John Doe\r\nUID:foo\r\nEND:VCARD\r\n",
- [],
- "BEGIN:VCARD\r\nVERSION:4.0\r\nFN:John Doe\r\nUID:foo\r\nEND:VCARD\r\n",
- ];
-
- // No VERSION
- $tests[] = [
- "BEGIN:VCARD\r\nFN:John Doe\r\nUID:foo\r\nEND:VCARD\r\n",
- [
- 'VERSION MUST appear exactly once in a VCARD component',
- ],
- "BEGIN:VCARD\r\nVERSION:4.0\r\nFN:John Doe\r\nUID:foo\r\nEND:VCARD\r\n",
- ];
-
- // Unknown version
- $tests[] = [
- "BEGIN:VCARD\r\nVERSION:2.2\r\nFN:John Doe\r\nUID:foo\r\nEND:VCARD\r\n",
- [
- 'Only vcard version 4.0 (RFC6350), version 3.0 (RFC2426) or version 2.1 (icm-vcard-2.1) are supported.',
- ],
- "BEGIN:VCARD\r\nVERSION:2.1\r\nFN:John Doe\r\nUID:foo\r\nEND:VCARD\r\n",
- ];
-
- // No FN
- $tests[] = [
- "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nEND:VCARD\r\n",
- [
- 'The FN property must appear in the VCARD component exactly 1 time',
- ],
- "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nEND:VCARD\r\n",
- ];
- // No FN, N fallback
- $tests[] = [
- "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nN:Doe;John;;;;;\r\nEND:VCARD\r\n",
- [
- 'The FN property must appear in the VCARD component exactly 1 time',
- ],
- "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nN:Doe;John;;;;;\r\nFN:John Doe\r\nEND:VCARD\r\n",
- ];
- // No FN, N fallback, no first name
- $tests[] = [
- "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nN:Doe;;;;;;\r\nEND:VCARD\r\n",
- [
- 'The FN property must appear in the VCARD component exactly 1 time',
- ],
- "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nN:Doe;;;;;;\r\nFN:Doe\r\nEND:VCARD\r\n",
- ];
-
- // No FN, ORG fallback
- $tests[] = [
- "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nORG:Acme Co.\r\nEND:VCARD\r\n",
- [
- 'The FN property must appear in the VCARD component exactly 1 time',
- ],
- "BEGIN:VCARD\r\nVERSION:4.0\r\nUID:foo\r\nORG:Acme Co.\r\nFN:Acme Co.\r\nEND:VCARD\r\n",
- ];
- return $tests;
-
- }
-
- function testGetDocumentType() {
-
- $vcard = new VCard([], false);
- $vcard->VERSION = '2.1';
- $this->assertEquals(VCard::VCARD21, $vcard->getDocumentType());
-
- $vcard = new VCard([], false);
- $vcard->VERSION = '3.0';
- $this->assertEquals(VCard::VCARD30, $vcard->getDocumentType());
-
- $vcard = new VCard([], false);
- $vcard->VERSION = '4.0';
- $this->assertEquals(VCard::VCARD40, $vcard->getDocumentType());
-
- $vcard = new VCard([], false);
- $this->assertEquals(VCard::UNKNOWN, $vcard->getDocumentType());
- }
-
- function testGetByType() {
- $vcard = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-EMAIL;TYPE=home:1@example.org
-EMAIL;TYPE=work:2@example.org
-END:VCARD
-VCF;
-
- $vcard = VObject\Reader::read($vcard);
- $this->assertEquals('1@example.org', $vcard->getByType('EMAIL', 'home')->getValue());
- $this->assertEquals('2@example.org', $vcard->getByType('EMAIL', 'work')->getValue());
- $this->assertNull($vcard->getByType('EMAIL', 'non-existant'));
- $this->assertNull($vcard->getByType('ADR', 'non-existant'));
- }
-
- function testPreferredNoPref() {
-
- $vcard = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-EMAIL:1@example.org
-EMAIL:2@example.org
-END:VCARD
-VCF;
-
- $vcard = VObject\Reader::read($vcard);
- $this->assertEquals('1@example.org', $vcard->preferred('EMAIL')->getValue());
-
- }
-
- function testPreferredWithPref() {
-
- $vcard = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-EMAIL:1@example.org
-EMAIL;TYPE=PREF:2@example.org
-END:VCARD
-VCF;
-
- $vcard = VObject\Reader::read($vcard);
- $this->assertEquals('2@example.org', $vcard->preferred('EMAIL')->getValue());
-
- }
-
- function testPreferredWith40Pref() {
-
- $vcard = <<<VCF
-BEGIN:VCARD
-VERSION:4.0
-EMAIL:1@example.org
-EMAIL;PREF=3:2@example.org
-EMAIL;PREF=2:3@example.org
-END:VCARD
-VCF;
-
- $vcard = VObject\Reader::read($vcard);
- $this->assertEquals('3@example.org', $vcard->preferred('EMAIL')->getValue());
-
- }
-
- function testPreferredNotFound() {
-
- $vcard = <<<VCF
-BEGIN:VCARD
-VERSION:4.0
-END:VCARD
-VCF;
-
- $vcard = VObject\Reader::read($vcard);
- $this->assertNull($vcard->preferred('EMAIL'));
-
- }
-
- function testNoUIDCardDAV() {
-
- $vcard = <<<VCF
-BEGIN:VCARD
-VERSION:4.0
-FN:John Doe
-END:VCARD
-VCF;
- $this->assertValidate(
- $vcard,
- VCARD::PROFILE_CARDDAV,
- 3,
- 'vCards on CardDAV servers MUST have a UID property.'
- );
-
- }
-
- function testNoUIDNoCardDAV() {
-
- $vcard = <<<VCF
-BEGIN:VCARD
-VERSION:4.0
-FN:John Doe
-END:VCARD
-VCF;
- $this->assertValidate(
- $vcard,
- 0,
- 2,
- 'Adding a UID to a vCard property is recommended.'
- );
-
- }
- function testNoUIDNoCardDAVRepair() {
-
- $vcard = <<<VCF
-BEGIN:VCARD
-VERSION:4.0
-FN:John Doe
-END:VCARD
-VCF;
- $this->assertValidate(
- $vcard,
- VCARD::REPAIR,
- 1,
- 'Adding a UID to a vCard property is recommended.'
- );
-
- }
-
- function testVCard21CardDAV() {
-
- $vcard = <<<VCF
-BEGIN:VCARD
-VERSION:2.1
-FN:John Doe
-UID:foo
-END:VCARD
-VCF;
- $this->assertValidate(
- $vcard,
- VCARD::PROFILE_CARDDAV,
- 3,
- 'CardDAV servers are not allowed to accept vCard 2.1.'
- );
-
- }
-
- function testVCard21NoCardDAV() {
-
- $vcard = <<<VCF
-BEGIN:VCARD
-VERSION:2.1
-FN:John Doe
-UID:foo
-END:VCARD
-VCF;
- $this->assertValidate(
- $vcard,
- 0,
- 0
- );
-
- }
-
- function assertValidate($vcf, $options, $expectedLevel, $expectedMessage = null) {
-
- $vcal = VObject\Reader::read($vcf);
- $result = $vcal->validate($options);
-
- $this->assertValidateResult($result, $expectedLevel, $expectedMessage);
-
- }
-
- function assertValidateResult($input, $expectedLevel, $expectedMessage = null) {
-
- $messages = [];
- foreach ($input as $warning) {
- $messages[] = $warning['message'];
- }
-
- if ($expectedLevel === 0) {
- $this->assertEquals(0, count($input), 'No validation messages were expected. We got: ' . implode(', ', $messages));
- } else {
- $this->assertEquals(1, count($input), 'We expected exactly 1 validation message, We got: ' . implode(', ', $messages));
-
- $this->assertEquals($expectedMessage, $input[0]['message']);
- $this->assertEquals($expectedLevel, $input[0]['level']);
- }
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VEventTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VEventTest.php
deleted file mode 100644
index 11acd3f6b72..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VEventTest.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-class VEventTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * @dataProvider timeRangeTestData
- */
- function testInTimeRange(VEvent $vevent, $start, $end, $outcome) {
-
- $this->assertEquals($outcome, $vevent->isInTimeRange($start, $end));
-
- }
-
- function timeRangeTestData() {
-
- $tests = [];
-
- $calendar = new VCalendar();
-
- $vevent = $calendar->createComponent('VEVENT');
- $vevent->DTSTART = '20111223T120000Z';
- $tests[] = [$vevent, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
- $tests[] = [$vevent, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
-
- $vevent2 = clone $vevent;
- $vevent2->DTEND = '20111225T120000Z';
- $tests[] = [$vevent2, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
- $tests[] = [$vevent2, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
-
- $vevent3 = clone $vevent;
- $vevent3->DURATION = 'P1D';
- $tests[] = [$vevent3, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
- $tests[] = [$vevent3, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
-
- $vevent4 = clone $vevent;
- $vevent4->DTSTART = '20111225';
- $vevent4->DTSTART['VALUE'] = 'DATE';
- $tests[] = [$vevent4, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
- $tests[] = [$vevent4, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
- // Event with no end date should be treated as lasting the entire day.
- $tests[] = [$vevent4, new \DateTime('2011-12-25 16:00:00'), new \DateTime('2011-12-25 17:00:00'), true];
- // DTEND is non inclusive so all day events should not be returned on the next day.
- $tests[] = [$vevent4, new \DateTime('2011-12-26 00:00:00'), new \DateTime('2011-12-26 17:00:00'), false];
- // The timezone of timerange in question also needs to be considered.
- $tests[] = [$vevent4, new \DateTime('2011-12-26 00:00:00', new \DateTimeZone('Europe/Berlin')), new \DateTime('2011-12-26 17:00:00', new \DateTimeZone('Europe/Berlin')), false];
-
- $vevent5 = clone $vevent;
- $vevent5->DURATION = 'P1D';
- $vevent5->RRULE = 'FREQ=YEARLY';
- $tests[] = [$vevent5, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
- $tests[] = [$vevent5, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
- $tests[] = [$vevent5, new \DateTime('2013-12-01'), new \DateTime('2013-12-31'), true];
-
- $vevent6 = clone $vevent;
- $vevent6->DTSTART = '20111225';
- $vevent6->DTSTART['VALUE'] = 'DATE';
- $vevent6->DTEND = '20111225';
- $vevent6->DTEND['VALUE'] = 'DATE';
-
- $tests[] = [$vevent6, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
- $tests[] = [$vevent6, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
-
- // Added this test to ensure that recurrence rules with no DTEND also
- // get checked for the entire day.
- $vevent7 = clone $vevent;
- $vevent7->DTSTART = '20120101';
- $vevent7->DTSTART['VALUE'] = 'DATE';
- $vevent7->RRULE = 'FREQ=MONTHLY';
- $tests[] = [$vevent7, new \DateTime('2012-02-01 15:00:00'), new \DateTime('2012-02-02'), true];
- // The timezone of timerange in question should also be considered.
- $tests[] = [$vevent7, new \DateTime('2012-02-02 00:00:00', new \DateTimeZone('Europe/Berlin')), new \DateTime('2012-02-03 00:00:00', new \DateTimeZone('Europe/Berlin')), false];
-
- // Added this test to check recurring events that have no instances.
- $vevent8 = clone $vevent;
- $vevent8->DTSTART = '20130329T140000';
- $vevent8->DTEND = '20130329T153000';
- $vevent8->RRULE = ['FREQ' => 'WEEKLY', 'BYDAY' => ['FR'], 'UNTIL' => '20130412T115959Z'];
- $vevent8->add('EXDATE', '20130405T140000');
- $vevent8->add('EXDATE', '20130329T140000');
- $tests[] = [$vevent8, new \DateTime('2013-03-01'), new \DateTime('2013-04-01'), false];
-
- // Added this test to check recurring all day event that repeat every day
- $vevent9 = clone $vevent;
- $vevent9->DTSTART = '20161027';
- $vevent9->DTEND = '20161028';
- $vevent9->RRULE = 'FREQ=DAILY';
- $tests[] = [$vevent9, new \DateTime('2016-10-31'), new \DateTime('2016-12-12'), true];
-
- return $tests;
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VFreeBusyTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VFreeBusyTest.php
deleted file mode 100644
index 2d463fd09ad..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VFreeBusyTest.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use Sabre\VObject;
-use Sabre\VObject\Reader;
-
-class VFreeBusyTest extends \PHPUnit_Framework_TestCase {
-
- function testIsFree() {
-
- $input = <<<BLA
-BEGIN:VCALENDAR
-BEGIN:VFREEBUSY
-FREEBUSY;FBTYPE=FREE:20120912T000500Z/PT1H
-FREEBUSY;FBTYPE=BUSY:20120912T010000Z/20120912T020000Z
-FREEBUSY;FBTYPE=BUSY-TENTATIVE:20120912T020000Z/20120912T030000Z
-FREEBUSY;FBTYPE=BUSY-UNAVAILABLE:20120912T030000Z/20120912T040000Z
-FREEBUSY;FBTYPE=BUSY:20120912T050000Z/20120912T060000Z,20120912T080000Z/20120912T090000Z
-FREEBUSY;FBTYPE=BUSY:20120912T100000Z/PT1H
-END:VFREEBUSY
-END:VCALENDAR
-BLA;
-
- $obj = VObject\Reader::read($input);
- $vfb = $obj->VFREEBUSY;
-
- $tz = new \DateTimeZone('UTC');
-
- $this->assertFalse($vfb->isFree(new \DateTime('2012-09-12 01:15:00', $tz), new \DateTime('2012-09-12 01:45:00', $tz)));
- $this->assertFalse($vfb->isFree(new \DateTime('2012-09-12 08:05:00', $tz), new \DateTime('2012-09-12 08:10:00', $tz)));
- $this->assertFalse($vfb->isFree(new \DateTime('2012-09-12 10:15:00', $tz), new \DateTime('2012-09-12 10:45:00', $tz)));
-
- // Checking whether the end time is treated as non-inclusive
- $this->assertTrue($vfb->isFree(new \DateTime('2012-09-12 09:00:00', $tz), new \DateTime('2012-09-12 09:15:00', $tz)));
- $this->assertTrue($vfb->isFree(new \DateTime('2012-09-12 09:45:00', $tz), new \DateTime('2012-09-12 10:00:00', $tz)));
- $this->assertTrue($vfb->isFree(new \DateTime('2012-09-12 11:00:00', $tz), new \DateTime('2012-09-12 12:00:00', $tz)));
-
- }
-
- function testValidate() {
-
- $input = <<<HI
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:YoYo
-BEGIN:VFREEBUSY
-UID:some-random-id
-DTSTAMP:20140402T180200Z
-END:VFREEBUSY
-END:VCALENDAR
-HI;
-
- $obj = Reader::read($input);
-
- $warnings = $obj->validate();
- $messages = [];
- foreach ($warnings as $warning) {
- $messages[] = $warning['message'];
- }
-
- $this->assertEquals([], $messages);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VJournalTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VJournalTest.php
deleted file mode 100644
index 1a2362d4a73..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VJournalTest.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use Sabre\VObject\Component;
-use Sabre\VObject\Reader;
-
-class VJournalTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * @dataProvider timeRangeTestData
- */
- function testInTimeRange(VJournal $vtodo, $start, $end, $outcome) {
-
- $this->assertEquals($outcome, $vtodo->isInTimeRange($start, $end));
-
- }
-
- function testValidate() {
-
- $input = <<<HI
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:YoYo
-BEGIN:VJOURNAL
-UID:12345678
-DTSTAMP:20140402T174100Z
-END:VJOURNAL
-END:VCALENDAR
-HI;
-
- $obj = Reader::read($input);
-
- $warnings = $obj->validate();
- $messages = [];
- foreach ($warnings as $warning) {
- $messages[] = $warning['message'];
- }
-
- $this->assertEquals([], $messages);
-
- }
-
- function testValidateBroken() {
-
- $input = <<<HI
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:YoYo
-BEGIN:VJOURNAL
-UID:12345678
-DTSTAMP:20140402T174100Z
-URL:http://example.org/
-URL:http://example.com/
-END:VJOURNAL
-END:VCALENDAR
-HI;
-
- $obj = Reader::read($input);
-
- $warnings = $obj->validate();
- $messages = [];
- foreach ($warnings as $warning) {
- $messages[] = $warning['message'];
- }
-
- $this->assertEquals(
- ["URL MUST NOT appear more than once in a VJOURNAL component"],
- $messages
- );
-
- }
-
- function timeRangeTestData() {
-
- $calendar = new VCalendar();
-
- $tests = [];
-
- $vjournal = $calendar->createComponent('VJOURNAL');
- $vjournal->DTSTART = '20111223T120000Z';
- $tests[] = [$vjournal, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
- $tests[] = [$vjournal, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
-
- $vjournal2 = $calendar->createComponent('VJOURNAL');
- $vjournal2->DTSTART = '20111223';
- $vjournal2->DTSTART['VALUE'] = 'DATE';
- $tests[] = [$vjournal2, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
- $tests[] = [$vjournal2, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
-
- $vjournal3 = $calendar->createComponent('VJOURNAL');
- $tests[] = [$vjournal3, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), false];
- $tests[] = [$vjournal3, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
-
- return $tests;
- }
-
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VTimeZoneTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VTimeZoneTest.php
deleted file mode 100644
index f320fd3d6e8..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VTimeZoneTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use Sabre\VObject\Reader;
-
-class VTimeZoneTest extends \PHPUnit_Framework_TestCase {
-
- function testValidate() {
-
- $input = <<<HI
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:YoYo
-BEGIN:VTIMEZONE
-TZID:America/Toronto
-END:VTIMEZONE
-END:VCALENDAR
-HI;
-
- $obj = Reader::read($input);
-
- $warnings = $obj->validate();
- $messages = [];
- foreach ($warnings as $warning) {
- $messages[] = $warning['message'];
- }
-
- $this->assertEquals([], $messages);
-
- }
-
- function testGetTimeZone() {
-
- $input = <<<HI
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:YoYo
-BEGIN:VTIMEZONE
-TZID:America/Toronto
-END:VTIMEZONE
-END:VCALENDAR
-HI;
-
- $obj = Reader::read($input);
-
- $tz = new \DateTimeZone('America/Toronto');
-
- $this->assertEquals(
- $tz,
- $obj->VTIMEZONE->getTimeZone()
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VTodoTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VTodoTest.php
deleted file mode 100644
index 85c6e07842f..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Component/VTodoTest.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Component;
-
-use Sabre\VObject\Component;
-use Sabre\VObject\Reader;
-
-class VTodoTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * @dataProvider timeRangeTestData
- */
- function testInTimeRange(VTodo $vtodo, $start, $end, $outcome) {
-
- $this->assertEquals($outcome, $vtodo->isInTimeRange($start, $end));
-
- }
-
- function timeRangeTestData() {
-
- $tests = [];
-
- $calendar = new VCalendar();
-
- $vtodo = $calendar->createComponent('VTODO');
- $vtodo->DTSTART = '20111223T120000Z';
- $tests[] = [$vtodo, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
- $tests[] = [$vtodo, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
-
- $vtodo2 = clone $vtodo;
- $vtodo2->DURATION = 'P1D';
- $tests[] = [$vtodo2, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
- $tests[] = [$vtodo2, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
-
- $vtodo3 = clone $vtodo;
- $vtodo3->DUE = '20111225';
- $tests[] = [$vtodo3, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
- $tests[] = [$vtodo3, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
-
- $vtodo4 = $calendar->createComponent('VTODO');
- $vtodo4->DUE = '20111225';
- $tests[] = [$vtodo4, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
- $tests[] = [$vtodo4, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
-
- $vtodo5 = $calendar->createComponent('VTODO');
- $vtodo5->COMPLETED = '20111225';
- $tests[] = [$vtodo5, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
- $tests[] = [$vtodo5, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
-
- $vtodo6 = $calendar->createComponent('VTODO');
- $vtodo6->CREATED = '20111225';
- $tests[] = [$vtodo6, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
- $tests[] = [$vtodo6, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
-
- $vtodo7 = $calendar->createComponent('VTODO');
- $vtodo7->CREATED = '20111225';
- $vtodo7->COMPLETED = '20111226';
- $tests[] = [$vtodo7, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
- $tests[] = [$vtodo7, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false];
-
- $vtodo7 = $calendar->createComponent('VTODO');
- $tests[] = [$vtodo7, new \DateTime('2011-01-01'), new \DateTime('2012-01-01'), true];
- $tests[] = [$vtodo7, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), true];
-
- return $tests;
-
- }
-
- function testValidate() {
-
- $input = <<<HI
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:YoYo
-BEGIN:VTODO
-UID:1234-21355-123156
-DTSTAMP:20140402T183400Z
-END:VTODO
-END:VCALENDAR
-HI;
-
- $obj = Reader::read($input);
-
- $warnings = $obj->validate();
- $messages = [];
- foreach ($warnings as $warning) {
- $messages[] = $warning['message'];
- }
-
- $this->assertEquals([], $messages);
-
- }
-
- function testValidateInvalid() {
-
- $input = <<<HI
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:YoYo
-BEGIN:VTODO
-END:VTODO
-END:VCALENDAR
-HI;
-
- $obj = Reader::read($input);
-
- $warnings = $obj->validate();
- $messages = [];
- foreach ($warnings as $warning) {
- $messages[] = $warning['message'];
- }
-
- $this->assertEquals([
- "UID MUST appear exactly once in a VTODO component",
- "DTSTAMP MUST appear exactly once in a VTODO component",
- ], $messages);
-
- }
-
- function testValidateDUEDTSTARTMisMatch() {
-
- $input = <<<HI
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:YoYo
-BEGIN:VTODO
-UID:FOO
-DTSTART;VALUE=DATE-TIME:20140520T131600Z
-DUE;VALUE=DATE:20140520
-DTSTAMP;VALUE=DATE-TIME:20140520T131600Z
-END:VTODO
-END:VCALENDAR
-HI;
-
- $obj = Reader::read($input);
-
- $warnings = $obj->validate();
- $messages = [];
- foreach ($warnings as $warning) {
- $messages[] = $warning['message'];
- }
-
- $this->assertEquals([
- "The value type (DATE or DATE-TIME) must be identical for DUE and DTSTART",
- ], $messages);
-
- }
-
- function testValidateDUEbeforeDTSTART() {
-
- $input = <<<HI
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:YoYo
-BEGIN:VTODO
-UID:FOO
-DTSTART;VALUE=DATE:20140520
-DUE;VALUE=DATE:20140518
-DTSTAMP;VALUE=DATE-TIME:20140520T131600Z
-END:VTODO
-END:VCALENDAR
-HI;
-
- $obj = Reader::read($input);
-
- $warnings = $obj->validate();
- $messages = [];
- foreach ($warnings as $warning) {
- $messages[] = $warning['message'];
- }
-
- $this->assertEquals([
- "DUE must occur after DTSTART",
- ], $messages);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ComponentTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/ComponentTest.php
deleted file mode 100644
index 9323a43d1c1..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ComponentTest.php
+++ /dev/null
@@ -1,527 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-use Sabre\VObject\Component\VCalendar;
-use Sabre\VObject\Component\VCard;
-
-class ComponentTest extends \PHPUnit_Framework_TestCase {
-
- function testIterate() {
-
- $comp = new VCalendar([], false);
-
- $sub = $comp->createComponent('VEVENT');
- $comp->add($sub);
-
- $sub = $comp->createComponent('VTODO');
- $comp->add($sub);
-
- $count = 0;
- foreach ($comp->children() as $key => $subcomponent) {
-
- $count++;
- $this->assertInstanceOf('Sabre\\VObject\\Component', $subcomponent);
-
- }
- $this->assertEquals(2, $count);
- $this->assertEquals(1, $key);
-
- }
-
- function testMagicGet() {
-
- $comp = new VCalendar([], false);
-
- $sub = $comp->createComponent('VEVENT');
- $comp->add($sub);
-
- $sub = $comp->createComponent('VTODO');
- $comp->add($sub);
-
- $event = $comp->vevent;
- $this->assertInstanceOf('Sabre\\VObject\\Component', $event);
- $this->assertEquals('VEVENT', $event->name);
-
- $this->assertInternalType('null', $comp->vjournal);
-
- }
-
- function testMagicGetGroups() {
-
- $comp = new VCard();
-
- $sub = $comp->createProperty('GROUP1.EMAIL', '1@1.com');
- $comp->add($sub);
-
- $sub = $comp->createProperty('GROUP2.EMAIL', '2@2.com');
- $comp->add($sub);
-
- $sub = $comp->createProperty('EMAIL', '3@3.com');
- $comp->add($sub);
-
- $emails = $comp->email;
- $this->assertEquals(3, count($emails));
-
- $email1 = $comp->{"group1.email"};
- $this->assertEquals('EMAIL', $email1[0]->name);
- $this->assertEquals('GROUP1', $email1[0]->group);
-
- $email3 = $comp->{".email"};
- $this->assertEquals('EMAIL', $email3[0]->name);
- $this->assertEquals(null, $email3[0]->group);
-
- }
-
- function testMagicIsset() {
-
- $comp = new VCalendar();
-
- $sub = $comp->createComponent('VEVENT');
- $comp->add($sub);
-
- $sub = $comp->createComponent('VTODO');
- $comp->add($sub);
-
- $this->assertTrue(isset($comp->vevent));
- $this->assertTrue(isset($comp->vtodo));
- $this->assertFalse(isset($comp->vjournal));
-
- }
-
- function testMagicSetScalar() {
-
- $comp = new VCalendar();
- $comp->myProp = 'myValue';
-
- $this->assertInstanceOf('Sabre\\VObject\\Property', $comp->MYPROP);
- $this->assertEquals('myValue', (string)$comp->MYPROP);
-
-
- }
-
- function testMagicSetScalarTwice() {
-
- $comp = new VCalendar([], false);
- $comp->myProp = 'myValue';
- $comp->myProp = 'myValue';
-
- $this->assertEquals(1, count($comp->children()));
- $this->assertInstanceOf('Sabre\\VObject\\Property', $comp->MYPROP);
- $this->assertEquals('myValue', (string)$comp->MYPROP);
-
- }
-
- function testMagicSetArray() {
-
- $comp = new VCalendar();
- $comp->ORG = ['Acme Inc', 'Section 9'];
-
- $this->assertInstanceOf('Sabre\\VObject\\Property', $comp->ORG);
- $this->assertEquals(['Acme Inc', 'Section 9'], $comp->ORG->getParts());
-
- }
-
- function testMagicSetComponent() {
-
- $comp = new VCalendar();
-
- // Note that 'myProp' is ignored here.
- $comp->myProp = $comp->createComponent('VEVENT');
-
- $this->assertEquals(1, count($comp));
-
- $this->assertEquals('VEVENT', $comp->VEVENT->name);
-
- }
-
- function testMagicSetTwice() {
-
- $comp = new VCalendar([], false);
-
- $comp->VEVENT = $comp->createComponent('VEVENT');
- $comp->VEVENT = $comp->createComponent('VEVENT');
-
- $this->assertEquals(1, count($comp->children()));
-
- $this->assertEquals('VEVENT', $comp->VEVENT->name);
-
- }
-
- function testArrayAccessGet() {
-
- $comp = new VCalendar([], false);
-
- $event = $comp->createComponent('VEVENT');
- $event->summary = 'Event 1';
-
- $comp->add($event);
-
- $event2 = clone $event;
- $event2->summary = 'Event 2';
-
- $comp->add($event2);
-
- $this->assertEquals(2, count($comp->children()));
- $this->assertTrue($comp->vevent[1] instanceof Component);
- $this->assertEquals('Event 2', (string)$comp->vevent[1]->summary);
-
- }
-
- function testArrayAccessExists() {
-
- $comp = new VCalendar();
-
- $event = $comp->createComponent('VEVENT');
- $event->summary = 'Event 1';
-
- $comp->add($event);
-
- $event2 = clone $event;
- $event2->summary = 'Event 2';
-
- $comp->add($event2);
-
- $this->assertTrue(isset($comp->vevent[0]));
- $this->assertTrue(isset($comp->vevent[1]));
-
- }
-
- /**
- * @expectedException LogicException
- */
- function testArrayAccessSet() {
-
- $comp = new VCalendar();
- $comp['hey'] = 'hi there';
-
- }
- /**
- * @expectedException LogicException
- */
- function testArrayAccessUnset() {
-
- $comp = new VCalendar();
- unset($comp[0]);
-
- }
-
- function testAddScalar() {
-
- $comp = new VCalendar([], false);
-
- $comp->add('myprop', 'value');
-
- $this->assertEquals(1, count($comp->children()));
-
- $bla = $comp->children()[0];
-
- $this->assertTrue($bla instanceof Property);
- $this->assertEquals('MYPROP', $bla->name);
- $this->assertEquals('value', (string)$bla);
-
- }
-
- function testAddScalarParams() {
-
- $comp = new VCalendar([], false);
-
- $comp->add('myprop', 'value', ['param1' => 'value1']);
-
- $this->assertEquals(1, count($comp->children()));
-
- $bla = $comp->children()[0];
-
- $this->assertInstanceOf('Sabre\\VObject\\Property', $bla);
- $this->assertEquals('MYPROP', $bla->name);
- $this->assertEquals('value', (string)$bla);
-
- $this->assertEquals(1, count($bla->parameters()));
-
- $this->assertEquals('PARAM1', $bla->parameters['PARAM1']->name);
- $this->assertEquals('value1', $bla->parameters['PARAM1']->getValue());
-
- }
-
-
- function testAddComponent() {
-
- $comp = new VCalendar([], false);
-
- $comp->add($comp->createComponent('VEVENT'));
-
- $this->assertEquals(1, count($comp->children()));
-
- $this->assertEquals('VEVENT', $comp->VEVENT->name);
-
- }
-
- function testAddComponentTwice() {
-
- $comp = new VCalendar([], false);
-
- $comp->add($comp->createComponent('VEVENT'));
- $comp->add($comp->createComponent('VEVENT'));
-
- $this->assertEquals(2, count($comp->children()));
-
- $this->assertEquals('VEVENT', $comp->VEVENT->name);
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testAddArgFail() {
-
- $comp = new VCalendar();
- $comp->add($comp->createComponent('VEVENT'), 'hello');
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testAddArgFail2() {
-
- $comp = new VCalendar();
- $comp->add([]);
-
- }
-
- function testMagicUnset() {
-
- $comp = new VCalendar([], false);
- $comp->add($comp->createComponent('VEVENT'));
-
- unset($comp->vevent);
-
- $this->assertEquals(0, count($comp->children()));
-
- }
-
-
- function testCount() {
-
- $comp = new VCalendar();
- $this->assertEquals(1, $comp->count());
-
- }
-
- function testChildren() {
-
- $comp = new VCalendar([], false);
-
- // Note that 'myProp' is ignored here.
- $comp->add($comp->createComponent('VEVENT'));
- $comp->add($comp->createComponent('VTODO'));
-
- $r = $comp->children();
- $this->assertInternalType('array', $r);
- $this->assertEquals(2, count($r));
- }
-
- function testGetComponents() {
-
- $comp = new VCalendar();
-
- $comp->add($comp->createProperty('FOO', 'BAR'));
- $comp->add($comp->createComponent('VTODO'));
-
- $r = $comp->getComponents();
- $this->assertInternalType('array', $r);
- $this->assertEquals(1, count($r));
- $this->assertEquals('VTODO', $r[0]->name);
- }
-
- function testSerialize() {
-
- $comp = new VCalendar([], false);
- $this->assertEquals("BEGIN:VCALENDAR\r\nEND:VCALENDAR\r\n", $comp->serialize());
-
- }
-
- function testSerializeChildren() {
-
- $comp = new VCalendar([], false);
- $event = $comp->add($comp->createComponent('VEVENT'));
- unset($event->DTSTAMP, $event->UID);
- $todo = $comp->add($comp->createComponent('VTODO'));
- unset($todo->DTSTAMP, $todo->UID);
-
- $str = $comp->serialize();
-
- $this->assertEquals("BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nEND:VEVENT\r\nBEGIN:VTODO\r\nEND:VTODO\r\nEND:VCALENDAR\r\n", $str);
-
- }
-
- function testSerializeOrderCompAndProp() {
-
- $comp = new VCalendar([], false);
- $comp->add($event = $comp->createComponent('VEVENT'));
- $comp->add('PROP1', 'BLABLA');
- $comp->add('VERSION', '2.0');
- $comp->add($comp->createComponent('VTIMEZONE'));
-
- unset($event->DTSTAMP, $event->UID);
- $str = $comp->serialize();
-
- $this->assertEquals("BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPROP1:BLABLA\r\nBEGIN:VTIMEZONE\r\nEND:VTIMEZONE\r\nBEGIN:VEVENT\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n", $str);
-
- }
-
- function testAnotherSerializeOrderProp() {
-
- $prop4s = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10'];
-
- $comp = new VCard([], false);
-
- $comp->__set('SOMEPROP', 'FOO');
- $comp->__set('ANOTHERPROP', 'FOO');
- $comp->__set('THIRDPROP', 'FOO');
- foreach ($prop4s as $prop4) {
- $comp->add('PROP4', 'FOO ' . $prop4);
- }
- $comp->__set('PROPNUMBERFIVE', 'FOO');
- $comp->__set('PROPNUMBERSIX', 'FOO');
- $comp->__set('PROPNUMBERSEVEN', 'FOO');
- $comp->__set('PROPNUMBEREIGHT', 'FOO');
- $comp->__set('PROPNUMBERNINE', 'FOO');
- $comp->__set('PROPNUMBERTEN', 'FOO');
- $comp->__set('VERSION', '2.0');
- $comp->__set('UID', 'FOO');
-
- $str = $comp->serialize();
-
- $this->assertEquals("BEGIN:VCARD\r\nVERSION:2.0\r\nSOMEPROP:FOO\r\nANOTHERPROP:FOO\r\nTHIRDPROP:FOO\r\nPROP4:FOO 1\r\nPROP4:FOO 2\r\nPROP4:FOO 3\r\nPROP4:FOO 4\r\nPROP4:FOO 5\r\nPROP4:FOO 6\r\nPROP4:FOO 7\r\nPROP4:FOO 8\r\nPROP4:FOO 9\r\nPROP4:FOO 10\r\nPROPNUMBERFIVE:FOO\r\nPROPNUMBERSIX:FOO\r\nPROPNUMBERSEVEN:FOO\r\nPROPNUMBEREIGHT:FOO\r\nPROPNUMBERNINE:FOO\r\nPROPNUMBERTEN:FOO\r\nUID:FOO\r\nEND:VCARD\r\n", $str);
-
- }
-
- function testInstantiateWithChildren() {
-
- $comp = new VCard([
- 'ORG' => ['Acme Inc.', 'Section 9'],
- 'FN' => 'Finn The Human',
- ]);
-
- $this->assertEquals(['Acme Inc.', 'Section 9'], $comp->ORG->getParts());
- $this->assertEquals('Finn The Human', $comp->FN->getValue());
-
- }
-
- function testInstantiateSubComponent() {
-
- $comp = new VCalendar();
- $event = $comp->createComponent('VEVENT', [
- $comp->createProperty('UID', '12345'),
- ]);
- $comp->add($event);
-
- $this->assertEquals('12345', $comp->VEVENT->UID->getValue());
-
- }
-
- function testRemoveByName() {
-
- $comp = new VCalendar([], false);
- $comp->add('prop1', 'val1');
- $comp->add('prop2', 'val2');
- $comp->add('prop2', 'val2');
-
- $comp->remove('prop2');
- $this->assertFalse(isset($comp->prop2));
- $this->assertTrue(isset($comp->prop1));
-
- }
-
- function testRemoveByObj() {
-
- $comp = new VCalendar([], false);
- $comp->add('prop1', 'val1');
- $prop = $comp->add('prop2', 'val2');
-
- $comp->remove($prop);
- $this->assertFalse(isset($comp->prop2));
- $this->assertTrue(isset($comp->prop1));
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testRemoveNotFound() {
-
- $comp = new VCalendar([], false);
- $prop = $comp->createProperty('A', 'B');
- $comp->remove($prop);
-
- }
-
- /**
- * @dataProvider ruleData
- */
- function testValidateRules($componentList, $errorCount) {
-
- $vcard = new Component\VCard();
-
- $component = new FakeComponent($vcard, 'Hi', [], $defaults = false);
- foreach ($componentList as $v) {
- $component->add($v, 'Hello.');
- }
-
- $this->assertEquals($errorCount, count($component->validate()));
-
- }
-
- function testValidateRepair() {
-
- $vcard = new Component\VCard();
-
- $component = new FakeComponent($vcard, 'Hi', [], $defaults = false);
- $component->validate(Component::REPAIR);
- $this->assertEquals('yow', $component->BAR->getValue());
-
- }
-
- function ruleData() {
-
- return [
-
- [[], 2],
- [['FOO'], 3],
- [['BAR'], 1],
- [['BAZ'], 1],
- [['BAR','BAZ'], 0],
- [['BAR','BAZ','ZIM',], 0],
- [['BAR','BAZ','ZIM','GIR'], 0],
- [['BAR','BAZ','ZIM','GIR','GIR'], 1],
-
- ];
-
- }
-
-}
-
-class FakeComponent extends Component {
-
- function getValidationRules() {
-
- return [
- 'FOO' => '0',
- 'BAR' => '1',
- 'BAZ' => '+',
- 'ZIM' => '*',
- 'GIR' => '?',
- ];
-
- }
-
- function getDefaults() {
-
- return [
- 'BAR' => 'yow',
- ];
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/DateTimeParserTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/DateTimeParserTest.php
deleted file mode 100644
index 677c2893677..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/DateTimeParserTest.php
+++ /dev/null
@@ -1,699 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-use DateInterval;
-use DateTimeImmutable;
-use DateTimeZone;
-
-class DateTimeParserTest extends \PHPUnit_Framework_TestCase {
-
- function testParseICalendarDuration() {
-
- $this->assertEquals('+1 weeks', DateTimeParser::parseDuration('P1W', true));
- $this->assertEquals('+5 days', DateTimeParser::parseDuration('P5D', true));
- $this->assertEquals('+5 days 3 hours 50 minutes 12 seconds', DateTimeParser::parseDuration('P5DT3H50M12S', true));
- $this->assertEquals('-1 weeks 50 minutes', DateTimeParser::parseDuration('-P1WT50M', true));
- $this->assertEquals('+50 days 3 hours 2 seconds', DateTimeParser::parseDuration('+P50DT3H2S', true));
- $this->assertEquals('+0 seconds', DateTimeParser::parseDuration('+PT0S', true));
- $this->assertEquals(new DateInterval('PT0S'), DateTimeParser::parseDuration('PT0S'));
-
- }
-
- function testParseICalendarDurationDateInterval() {
-
- $expected = new DateInterval('P7D');
- $this->assertEquals($expected, DateTimeParser::parseDuration('P1W'));
- $this->assertEquals($expected, DateTimeParser::parse('P1W'));
-
- $expected = new DateInterval('PT3M');
- $expected->invert = true;
- $this->assertEquals($expected, DateTimeParser::parseDuration('-PT3M'));
-
- }
-
- /**
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testParseICalendarDurationFail() {
-
- DateTimeParser::parseDuration('P1X', true);
-
- }
-
- function testParseICalendarDateTime() {
-
- $dateTime = DateTimeParser::parseDateTime('20100316T141405');
-
- $compare = new DateTimeImmutable('2010-03-16 14:14:05', new DateTimeZone('UTC'));
-
- $this->assertEquals($compare, $dateTime);
-
- }
-
- /**
- * @depends testParseICalendarDateTime
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testParseICalendarDateTimeBadFormat() {
-
- $dateTime = DateTimeParser::parseDateTime('20100316T141405 ');
-
- }
-
- /**
- * @depends testParseICalendarDateTime
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testParseICalendarDateTimeInvalidTime() {
-
- $dateTime = DateTimeParser::parseDateTime('20100316T251405');
-
- }
-
- /**
- * @depends testParseICalendarDateTime
- */
- function testParseICalendarDateTimeUTC() {
-
- $dateTime = DateTimeParser::parseDateTime('20100316T141405Z');
-
- $compare = new DateTimeImmutable('2010-03-16 14:14:05', new DateTimeZone('UTC'));
- $this->assertEquals($compare, $dateTime);
-
- }
-
- /**
- * @depends testParseICalendarDateTime
- */
- function testParseICalendarDateTimeUTC2() {
-
- $dateTime = DateTimeParser::parseDateTime('20101211T160000Z');
-
- $compare = new DateTimeImmutable('2010-12-11 16:00:00', new DateTimeZone('UTC'));
- $this->assertEquals($compare, $dateTime);
-
- }
-
- /**
- * @depends testParseICalendarDateTime
- */
- function testParseICalendarDateTimeCustomTimeZone() {
-
- $dateTime = DateTimeParser::parseDateTime('20100316T141405', new DateTimeZone('Europe/Amsterdam'));
-
- $compare = new DateTimeImmutable('2010-03-16 14:14:05', new DateTimeZone('Europe/Amsterdam'));
- $this->assertEquals($compare, $dateTime);
-
- }
-
- function testParseICalendarDate() {
-
- $dateTime = DateTimeParser::parseDate('20100316');
-
- $expected = new DateTimeImmutable('2010-03-16 00:00:00', new DateTimeZone('UTC'));
-
- $this->assertEquals($expected, $dateTime);
-
- $dateTime = DateTimeParser::parse('20100316');
- $this->assertEquals($expected, $dateTime);
-
- }
-
- /**
- * TCheck if a date with year > 4000 will not throw an exception. iOS seems to use 45001231 in yearly recurring events
- */
- function testParseICalendarDateGreaterThan4000() {
-
- $dateTime = DateTimeParser::parseDate('45001231');
-
- $expected = new DateTimeImmutable('4500-12-31 00:00:00', new DateTimeZone('UTC'));
-
- $this->assertEquals($expected, $dateTime);
-
- $dateTime = DateTimeParser::parse('45001231');
- $this->assertEquals($expected, $dateTime);
-
- }
-
- /**
- * Check if a datetime with year > 4000 will not throw an exception. iOS seems to use 45001231T235959 in yearly recurring events
- */
- function testParseICalendarDateTimeGreaterThan4000() {
-
- $dateTime = DateTimeParser::parseDateTime('45001231T235959');
-
- $expected = new DateTimeImmutable('4500-12-31 23:59:59', new DateTimeZone('UTC'));
-
- $this->assertEquals($expected, $dateTime);
-
- $dateTime = DateTimeParser::parse('45001231T235959');
- $this->assertEquals($expected, $dateTime);
-
- }
-
- /**
- * @depends testParseICalendarDate
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testParseICalendarDateBadFormat() {
-
- $dateTime = DateTimeParser::parseDate('20100316T141405');
-
- }
-
- /**
- * @depends testParseICalendarDate
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testParseICalendarDateInvalidDate() {
-
- $dateTime = DateTimeParser::parseDate('20101331');
-
- }
-
- /**
- * @dataProvider vcardDates
- */
- function testVCardDate($input, $output) {
-
- $this->assertEquals(
- $output,
- DateTimeParser::parseVCardDateTime($input)
- );
-
- }
-
- /**
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testBadVCardDate() {
-
- DateTimeParser::parseVCardDateTime('1985---01');
-
- }
-
- /**
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testBadVCardTime() {
-
- DateTimeParser::parseVCardTime('23:12:166');
-
- }
-
- function vcardDates() {
-
- return [
- [
- "19961022T140000",
- [
- "year" => 1996,
- "month" => 10,
- "date" => 22,
- "hour" => 14,
- "minute" => 00,
- "second" => 00,
- "timezone" => null
- ],
- ],
- [
- "--1022T1400",
- [
- "year" => null,
- "month" => 10,
- "date" => 22,
- "hour" => 14,
- "minute" => 00,
- "second" => null,
- "timezone" => null
- ],
- ],
- [
- "---22T14",
- [
- "year" => null,
- "month" => null,
- "date" => 22,
- "hour" => 14,
- "minute" => null,
- "second" => null,
- "timezone" => null
- ],
- ],
- [
- "19850412",
- [
- "year" => 1985,
- "month" => 4,
- "date" => 12,
- "hour" => null,
- "minute" => null,
- "second" => null,
- "timezone" => null
- ],
- ],
- [
- "1985-04",
- [
- "year" => 1985,
- "month" => 04,
- "date" => null,
- "hour" => null,
- "minute" => null,
- "second" => null,
- "timezone" => null
- ],
- ],
- [
- "1985",
- [
- "year" => 1985,
- "month" => null,
- "date" => null,
- "hour" => null,
- "minute" => null,
- "second" => null,
- "timezone" => null
- ],
- ],
- [
- "--0412",
- [
- "year" => null,
- "month" => 4,
- "date" => 12,
- "hour" => null,
- "minute" => null,
- "second" => null,
- "timezone" => null
- ],
- ],
- [
- "---12",
- [
- "year" => null,
- "month" => null,
- "date" => 12,
- "hour" => null,
- "minute" => null,
- "second" => null,
- "timezone" => null
- ],
- ],
- [
- "T102200",
- [
- "year" => null,
- "month" => null,
- "date" => null,
- "hour" => 10,
- "minute" => 22,
- "second" => 0,
- "timezone" => null
- ],
- ],
- [
- "T1022",
- [
- "year" => null,
- "month" => null,
- "date" => null,
- "hour" => 10,
- "minute" => 22,
- "second" => null,
- "timezone" => null
- ],
- ],
- [
- "T10",
- [
- "year" => null,
- "month" => null,
- "date" => null,
- "hour" => 10,
- "minute" => null,
- "second" => null,
- "timezone" => null
- ],
- ],
- [
- "T-2200",
- [
- "year" => null,
- "month" => null,
- "date" => null,
- "hour" => null,
- "minute" => 22,
- "second" => 00,
- "timezone" => null
- ],
- ],
- [
- "T--00",
- [
- "year" => null,
- "month" => null,
- "date" => null,
- "hour" => null,
- "minute" => null,
- "second" => 00,
- "timezone" => null
- ],
- ],
- [
- "T102200Z",
- [
- "year" => null,
- "month" => null,
- "date" => null,
- "hour" => 10,
- "minute" => 22,
- "second" => 00,
- "timezone" => 'Z'
- ],
- ],
- [
- "T102200-0800",
- [
- "year" => null,
- "month" => null,
- "date" => null,
- "hour" => 10,
- "minute" => 22,
- "second" => 00,
- "timezone" => '-0800'
- ],
- ],
-
- // extended format
- [
- "2012-11-29T15:10:53Z",
- [
- "year" => 2012,
- "month" => 11,
- "date" => 29,
- "hour" => 15,
- "minute" => 10,
- "second" => 53,
- "timezone" => 'Z'
- ],
- ],
-
- // with milliseconds
- [
- "20121129T151053.123Z",
- [
- "year" => 2012,
- "month" => 11,
- "date" => 29,
- "hour" => 15,
- "minute" => 10,
- "second" => 53,
- "timezone" => 'Z'
- ],
- ],
-
- // extended format with milliseconds
- [
- "2012-11-29T15:10:53.123Z",
- [
- "year" => 2012,
- "month" => 11,
- "date" => 29,
- "hour" => 15,
- "minute" => 10,
- "second" => 53,
- "timezone" => 'Z'
- ],
- ],
- ];
-
- }
-
- function testDateAndOrTime_DateWithYearMonthDay() {
-
- $this->assertDateAndOrTimeEqualsTo(
- '20150128',
- [
- 'year' => '2015',
- 'month' => '01',
- 'date' => '28'
- ]
- );
-
- }
-
- function testDateAndOrTime_DateWithYearMonth() {
-
- $this->assertDateAndOrTimeEqualsTo(
- '2015-01',
- [
- 'year' => '2015',
- 'month' => '01'
- ]
- );
-
- }
-
- function testDateAndOrTime_DateWithMonth() {
-
- $this->assertDateAndOrTimeEqualsTo(
- '--01',
- [
- 'month' => '01'
- ]
- );
-
- }
-
- function testDateAndOrTime_DateWithMonthDay() {
-
- $this->assertDateAndOrTimeEqualsTo(
- '--0128',
- [
- 'month' => '01',
- 'date' => '28'
- ]
- );
-
- }
-
- function testDateAndOrTime_DateWithDay() {
-
- $this->assertDateAndOrTimeEqualsTo(
- '---28',
- [
- 'date' => '28'
- ]
- );
-
- }
-
- function testDateAndOrTime_TimeWithHour() {
-
- $this->assertDateAndOrTimeEqualsTo(
- '13',
- [
- 'hour' => '13'
- ]
- );
-
- }
-
- function testDateAndOrTime_TimeWithHourMinute() {
-
- $this->assertDateAndOrTimeEqualsTo(
- '1353',
- [
- 'hour' => '13',
- 'minute' => '53'
- ]
- );
-
- }
-
- function testDateAndOrTime_TimeWithHourSecond() {
-
- $this->assertDateAndOrTimeEqualsTo(
- '135301',
- [
- 'hour' => '13',
- 'minute' => '53',
- 'second' => '01'
- ]
-
- );
-
- }
-
- function testDateAndOrTime_TimeWithMinute() {
-
- $this->assertDateAndOrTimeEqualsTo(
- '-53',
- [
- 'minute' => '53'
- ]
- );
-
- }
-
- function testDateAndOrTime_TimeWithMinuteSecond() {
-
- $this->assertDateAndOrTimeEqualsTo(
- '-5301',
- [
- 'minute' => '53',
- 'second' => '01'
- ]
- );
-
- }
-
- function testDateAndOrTime_TimeWithSecond() {
-
- $this->assertTrue(true);
-
- /**
- * This is unreachable due to a conflict between date and time pattern.
- * This is an error in the specification, not in our implementation.
- */
- }
-
- function testDateAndOrTime_TimeWithSecondZ() {
-
- $this->assertDateAndOrTimeEqualsTo(
- '--01Z',
- [
- 'second' => '01',
- 'timezone' => 'Z'
- ]
- );
-
- }
-
- function testDateAndOrTime_TimeWithSecondTZ() {
-
- $this->assertDateAndOrTimeEqualsTo(
- '--01+1234',
- [
- 'second' => '01',
- 'timezone' => '+1234'
- ]
- );
-
- }
-
- function testDateAndOrTime_DateTimeWithYearMonthDayHour() {
-
- $this->assertDateAndOrTimeEqualsTo(
- '20150128T13',
- [
- 'year' => '2015',
- 'month' => '01',
- 'date' => '28',
- 'hour' => '13'
- ]
- );
-
- }
-
- function testDateAndOrTime_DateTimeWithMonthDayHour() {
-
- $this->assertDateAndOrTimeEqualsTo(
- '--0128T13',
- [
- 'month' => '01',
- 'date' => '28',
- 'hour' => '13'
- ]
- );
-
- }
-
- function testDateAndOrTime_DateTimeWithDayHour() {
-
- $this->assertDateAndOrTimeEqualsTo(
- '---28T13',
- [
- 'date' => '28',
- 'hour' => '13'
- ]
- );
-
- }
-
- function testDateAndOrTime_DateTimeWithDayHourMinute() {
-
- $this->assertDateAndOrTimeEqualsTo(
- '---28T1353',
- [
- 'date' => '28',
- 'hour' => '13',
- 'minute' => '53'
- ]
- );
-
- }
-
- function testDateAndOrTime_DateTimeWithDayHourMinuteSecond() {
-
- $this->assertDateAndOrTimeEqualsTo(
- '---28T135301',
- [
- 'date' => '28',
- 'hour' => '13',
- 'minute' => '53',
- 'second' => '01'
- ]
- );
-
- }
-
- function testDateAndOrTime_DateTimeWithDayHourZ() {
-
- $this->assertDateAndOrTimeEqualsTo(
- '---28T13Z',
- [
- 'date' => '28',
- 'hour' => '13',
- 'timezone' => 'Z'
- ]
- );
-
- }
-
- function testDateAndOrTime_DateTimeWithDayHourTZ() {
-
- $this->assertDateAndOrTimeEqualsTo(
- '---28T13+1234',
- [
- 'date' => '28',
- 'hour' => '13',
- 'timezone' => '+1234'
- ]
- );
-
- }
-
- protected function assertDateAndOrTimeEqualsTo($date, $parts) {
-
- $this->assertSame(
- DateTimeParser::parseVCardDateAndOrTime($date),
- array_merge(
- [
- 'year' => null,
- 'month' => null,
- 'date' => null,
- 'hour' => null,
- 'minute' => null,
- 'second' => null,
- 'timezone' => null
- ],
- $parts
- )
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/DocumentTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/DocumentTest.php
deleted file mode 100644
index f1730fdeab1..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/DocumentTest.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class DocumentTest extends \PHPUnit_Framework_TestCase {
-
- function testGetDocumentType() {
-
- $doc = new MockDocument();
- $this->assertEquals(Document::UNKNOWN, $doc->getDocumentType());
-
- }
-
- function testConstruct() {
-
- $doc = new MockDocument('VLIST');
- $this->assertEquals('VLIST', $doc->name);
-
- }
-
- function testCreateComponent() {
-
- $vcal = new Component\VCalendar([], false);
-
- $event = $vcal->createComponent('VEVENT');
-
- $this->assertInstanceOf('Sabre\VObject\Component\VEvent', $event);
- $vcal->add($event);
-
- $prop = $vcal->createProperty('X-PROP', '1234256', ['X-PARAM' => '3']);
- $this->assertInstanceOf('Sabre\VObject\Property', $prop);
-
- $event->add($prop);
-
- unset(
- $event->DTSTAMP,
- $event->UID
- );
-
- $out = $vcal->serialize();
- $this->assertEquals("BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nX-PROP;X-PARAM=3:1234256\r\nEND:VEVENT\r\nEND:VCALENDAR\r\n", $out);
-
- }
-
- function testCreate() {
-
- $vcal = new Component\VCalendar([], false);
-
- $event = $vcal->create('VEVENT');
- $this->assertInstanceOf('Sabre\VObject\Component\VEvent', $event);
-
- $prop = $vcal->create('CALSCALE');
- $this->assertInstanceOf('Sabre\VObject\Property\Text', $prop);
-
- }
-
- function testGetClassNameForPropertyValue() {
-
- $vcal = new Component\VCalendar([], false);
- $this->assertEquals('Sabre\\VObject\\Property\\Text', $vcal->getClassNameForPropertyValue('TEXT'));
- $this->assertNull($vcal->getClassNameForPropertyValue('FOO'));
-
- }
-
- function testDestroy() {
-
- $vcal = new Component\VCalendar([], false);
- $event = $vcal->createComponent('VEVENT');
-
- $this->assertInstanceOf('Sabre\VObject\Component\VEvent', $event);
- $vcal->add($event);
-
- $prop = $vcal->createProperty('X-PROP', '1234256', ['X-PARAM' => '3']);
-
- $event->add($prop);
-
- $this->assertEquals($event, $prop->parent);
-
- $vcal->destroy();
-
- $this->assertNull($prop->parent);
-
-
- }
-
-}
-
-
-class MockDocument extends Document {
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ElementListTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/ElementListTest.php
deleted file mode 100644
index e63231133ad..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ElementListTest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class ElementListTest extends \PHPUnit_Framework_TestCase {
-
- function testIterate() {
-
- $cal = new Component\VCalendar();
- $sub = $cal->createComponent('VEVENT');
-
- $elems = [
- $sub,
- clone $sub,
- clone $sub
- ];
-
- $elemList = new ElementList($elems);
-
- $count = 0;
- foreach ($elemList as $key => $subcomponent) {
-
- $count++;
- $this->assertInstanceOf('Sabre\\VObject\\Component', $subcomponent);
-
- }
- $this->assertEquals(3, $count);
- $this->assertEquals(2, $key);
-
- }
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/EmClientTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/EmClientTest.php
deleted file mode 100644
index 5743d48d815..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/EmClientTest.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-use DateTimeImmutable;
-
-class EmClientTest extends \PHPUnit_Framework_TestCase {
-
- function testParseTz() {
-
- $str = 'BEGIN:VCALENDAR
-X-WR-CALNAME:Blackhawks Schedule 2011-12
-X-APPLE-CALENDAR-COLOR:#E51717
-X-WR-TIMEZONE:America/Chicago
-CALSCALE:GREGORIAN
-PRODID:-//eM Client/4.0.13961.0
-VERSION:2.0
-BEGIN:VTIMEZONE
-TZID:America/Chicago
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0600
-RRULE:FREQ=YEARLY;BYDAY=2SU;BYMONTH=3
-DTSTART:20070311T020000
-TZNAME:CDT
-TZOFFSETTO:-0500
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0500
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=11
-DTSTART:20071104T020000
-TZNAME:CST
-TZOFFSETTO:-0600
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-CREATED:20110624T181236Z
-UID:be3bbfff-96e8-4c66-9908-ab791a62231d
-DTEND;TZID="America/Chicago":20111008T223000
-TRANSP:OPAQUE
-SUMMARY:Stars @ Blackhawks (Home Opener)
-DTSTART;TZID="America/Chicago":20111008T193000
-DTSTAMP:20120330T013232Z
-SEQUENCE:2
-X-MICROSOFT-CDO-BUSYSTATUS:BUSY
-LAST-MODIFIED:20120330T013237Z
-CLASS:PUBLIC
-END:VEVENT
-END:VCALENDAR';
-
- $vObject = Reader::read($str);
- $dt = $vObject->VEVENT->DTSTART->getDateTime();
- $this->assertEquals(new DateTimeImmutable('2011-10-08 19:30:00', new \DateTimeZone('America/Chicago')), $dt);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/EmptyParameterTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/EmptyParameterTest.php
deleted file mode 100644
index a9e9fcc5cd9..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/EmptyParameterTest.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class EmptyParameterTest extends \PHPUnit_Framework_TestCase {
-
- function testRead() {
-
- $input = <<<VCF
-BEGIN:VCARD
-VERSION:2.1
-N:Doe;Jon;;;
-FN:Jon Doe
-EMAIL;X-INTERN:foo@example.org
-UID:foo
-END:VCARD
-VCF;
-
- $vcard = Reader::read($input);
-
- $this->assertInstanceOf('Sabre\\VObject\\Component\\VCard', $vcard);
- $vcard = $vcard->convert(\Sabre\VObject\Document::VCARD30);
- $vcard = $vcard->serialize();
-
- $converted = Reader::read($vcard);
- $converted->validate();
-
- $this->assertTrue(isset($converted->EMAIL['X-INTERN']));
-
- $version = Version::VERSION;
-
- $expected = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-N:Doe;Jon;;;
-FN:Jon Doe
-EMAIL;X-INTERN=:foo@example.org
-UID:foo
-END:VCARD
-
-VCF;
-
- $this->assertEquals($expected, str_replace("\r", "", $vcard));
-
- }
-
- function testVCard21Parameter() {
-
- $vcard = new Component\VCard([], false);
- $vcard->VERSION = '2.1';
- $vcard->PHOTO = 'random_stuff';
- $vcard->PHOTO->add(null, 'BASE64');
- $vcard->UID = 'foo-bar';
-
- $result = $vcard->serialize();
- $expected = [
- "BEGIN:VCARD",
- "VERSION:2.1",
- "PHOTO;BASE64:" . base64_encode('random_stuff'),
- "UID:foo-bar",
- "END:VCARD",
- "",
- ];
-
- $this->assertEquals(implode("\r\n", $expected), $result);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/EmptyValueIssueTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/EmptyValueIssueTest.php
deleted file mode 100644
index 7a34944992c..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/EmptyValueIssueTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-/**
- * This test is written for Issue 68:
- *
- * https://github.com/fruux/sabre-vobject/issues/68
- */
-class EmptyValueIssueTest extends \PHPUnit_Framework_TestCase {
-
- function testDecodeValue() {
-
- $input = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-DESCRIPTION:This is a descpription\\nwith a linebreak and a \\; \\, and :
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $vobj = Reader::read($input);
-
- // Before this bug was fixed, getValue() would return nothing.
- $this->assertEquals("This is a descpription\nwith a linebreak and a ; , and :", $vobj->VEVENT->DESCRIPTION->getValue());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/FreeBusyDataTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/FreeBusyDataTest.php
deleted file mode 100644
index 9b5f541b9f6..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/FreeBusyDataTest.php
+++ /dev/null
@@ -1,318 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class FreeBusyDataTest extends \PHPUnit_Framework_TestCase {
-
- function testGetData() {
-
- $fb = new FreeBusyData(100, 200);
-
- $this->assertEquals(
- [
- [
- 'start' => 100,
- 'end' => 200,
- 'type' => 'FREE',
- ]
- ],
- $fb->getData()
- );
-
- }
-
- /**
- * @depends testGetData
- */
- function testAddBeginning() {
-
- $fb = new FreeBusyData(100, 200);
-
- // Overwriting the first half
- $fb->add(100, 150, 'BUSY');
-
-
- $this->assertEquals(
- [
- [
- 'start' => 100,
- 'end' => 150,
- 'type' => 'BUSY',
- ],
- [
- 'start' => 150,
- 'end' => 200,
- 'type' => 'FREE',
- ]
- ],
- $fb->getData()
- );
-
- // Overwriting the first half again
- $fb->add(100, 150, 'BUSY-TENTATIVE');
-
- $this->assertEquals(
- [
- [
- 'start' => 100,
- 'end' => 150,
- 'type' => 'BUSY-TENTATIVE',
- ],
- [
- 'start' => 150,
- 'end' => 200,
- 'type' => 'FREE',
- ]
- ],
- $fb->getData()
- );
-
- }
-
- /**
- * @depends testAddBeginning
- */
- function testAddEnd() {
-
- $fb = new FreeBusyData(100, 200);
-
- // Overwriting the first half
- $fb->add(150, 200, 'BUSY');
-
-
- $this->assertEquals(
- [
- [
- 'start' => 100,
- 'end' => 150,
- 'type' => 'FREE',
- ],
- [
- 'start' => 150,
- 'end' => 200,
- 'type' => 'BUSY',
- ],
- ],
- $fb->getData()
- );
-
-
- }
-
- /**
- * @depends testAddEnd
- */
- function testAddMiddle() {
-
- $fb = new FreeBusyData(100, 200);
-
- // Overwriting the first half
- $fb->add(150, 160, 'BUSY');
-
-
- $this->assertEquals(
- [
- [
- 'start' => 100,
- 'end' => 150,
- 'type' => 'FREE',
- ],
- [
- 'start' => 150,
- 'end' => 160,
- 'type' => 'BUSY',
- ],
- [
- 'start' => 160,
- 'end' => 200,
- 'type' => 'FREE',
- ],
- ],
- $fb->getData()
- );
-
- }
-
- /**
- * @depends testAddMiddle
- */
- function testAddMultiple() {
-
- $fb = new FreeBusyData(100, 200);
-
- $fb->add(110, 120, 'BUSY');
- $fb->add(130, 140, 'BUSY');
-
- $this->assertEquals(
- [
- [
- 'start' => 100,
- 'end' => 110,
- 'type' => 'FREE',
- ],
- [
- 'start' => 110,
- 'end' => 120,
- 'type' => 'BUSY',
- ],
- [
- 'start' => 120,
- 'end' => 130,
- 'type' => 'FREE',
- ],
- [
- 'start' => 130,
- 'end' => 140,
- 'type' => 'BUSY',
- ],
- [
- 'start' => 140,
- 'end' => 200,
- 'type' => 'FREE',
- ],
- ],
- $fb->getData()
- );
-
- }
-
- /**
- * @depends testAddMultiple
- */
- function testAddMultipleOverlap() {
-
- $fb = new FreeBusyData(100, 200);
-
- $fb->add(110, 120, 'BUSY');
- $fb->add(130, 140, 'BUSY');
-
- $this->assertEquals(
- [
- [
- 'start' => 100,
- 'end' => 110,
- 'type' => 'FREE',
- ],
- [
- 'start' => 110,
- 'end' => 120,
- 'type' => 'BUSY',
- ],
- [
- 'start' => 120,
- 'end' => 130,
- 'type' => 'FREE',
- ],
- [
- 'start' => 130,
- 'end' => 140,
- 'type' => 'BUSY',
- ],
- [
- 'start' => 140,
- 'end' => 200,
- 'type' => 'FREE',
- ],
- ],
- $fb->getData()
- );
-
- $fb->add(115, 135, 'BUSY-TENTATIVE');
-
- $this->assertEquals(
- [
- [
- 'start' => 100,
- 'end' => 110,
- 'type' => 'FREE',
- ],
- [
- 'start' => 110,
- 'end' => 115,
- 'type' => 'BUSY',
- ],
- [
- 'start' => 115,
- 'end' => 135,
- 'type' => 'BUSY-TENTATIVE',
- ],
- [
- 'start' => 135,
- 'end' => 140,
- 'type' => 'BUSY',
- ],
- [
- 'start' => 140,
- 'end' => 200,
- 'type' => 'FREE',
- ],
- ],
- $fb->getData()
- );
- }
-
- /**
- * @depends testAddMultipleOverlap
- */
- function testAddMultipleOverlapAndMerge() {
-
- $fb = new FreeBusyData(100, 200);
-
- $fb->add(110, 120, 'BUSY');
- $fb->add(130, 140, 'BUSY');
-
- $this->assertEquals(
- [
- [
- 'start' => 100,
- 'end' => 110,
- 'type' => 'FREE',
- ],
- [
- 'start' => 110,
- 'end' => 120,
- 'type' => 'BUSY',
- ],
- [
- 'start' => 120,
- 'end' => 130,
- 'type' => 'FREE',
- ],
- [
- 'start' => 130,
- 'end' => 140,
- 'type' => 'BUSY',
- ],
- [
- 'start' => 140,
- 'end' => 200,
- 'type' => 'FREE',
- ],
- ],
- $fb->getData()
- );
-
- $fb->add(115, 135, 'BUSY');
-
- $this->assertEquals(
- [
- [
- 'start' => 100,
- 'end' => 110,
- 'type' => 'FREE',
- ],
- [
- 'start' => 110,
- 'end' => 140,
- 'type' => 'BUSY',
- ],
- [
- 'start' => 140,
- 'end' => 200,
- 'type' => 'FREE',
- ],
- ],
- $fb->getData()
- );
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/FreeBusyGeneratorTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/FreeBusyGeneratorTest.php
deleted file mode 100644
index 70e83ab2f30..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/FreeBusyGeneratorTest.php
+++ /dev/null
@@ -1,751 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class FreeBusyGeneratorTest extends \PHPUnit_Framework_TestCase {
-
- use PHPUnitAssertions;
-
- function testGeneratorBaseObject() {
-
- $obj = new Component\VCalendar();
- $obj->METHOD = 'PUBLISH';
-
- $gen = new FreeBusyGenerator();
- $gen->setObjects([]);
- $gen->setBaseObject($obj);
-
- $result = $gen->getResult();
-
- $this->assertEquals('PUBLISH', $result->METHOD->getValue());
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testInvalidArg() {
-
- $gen = new FreeBusyGenerator(
- new \DateTime('2012-01-01'),
- new \DateTime('2012-12-31'),
- new \StdClass()
- );
-
- }
-
- /**
- * This function takes a list of objects (icalendar objects), and turns
- * them into a freebusy report.
- *
- * Then it takes the expected output and compares it to what we actually
- * got.
- *
- * It only generates the freebusy report for the following time-range:
- * 2011-01-01 11:00:00 until 2011-01-03 11:11:11
- *
- * @param string $expected
- * @param array $input
- * @param string|null $timeZone
- * @param string $vavailability
- * @return void
- */
- function assertFreeBusyReport($expected, $input, $timeZone = null, $vavailability = null) {
-
- $gen = new FreeBusyGenerator(
- new \DateTime('20110101T110000Z', new \DateTimeZone('UTC')),
- new \DateTime('20110103T110000Z', new \DateTimeZone('UTC')),
- $input,
- $timeZone
- );
-
- if ($vavailability) {
- if (is_string($vavailability)) {
- $vavailability = Reader::read($vavailability);
- }
- $gen->setVAvailability($vavailability);
- }
-
- $output = $gen->getResult();
-
- // Removing DTSTAMP because it changes every time.
- unset($output->VFREEBUSY->DTSTAMP);
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VFREEBUSY
-DTSTART:20110101T110000Z
-DTEND:20110103T110000Z
-$expected
-END:VFREEBUSY
-END:VCALENDAR
-ICS;
-
- $this->assertVObjectEqualsVObject($expected, $output);
-
- }
-
- function testSimple() {
-
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar
-DTSTART:20110101T120000Z
-DTEND:20110101T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $this->assertFreeBusyReport(
- "FREEBUSY:20110101T120000Z/20110101T130000Z",
- $blob
- );
-
- }
-
- function testSource() {
-
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar
-DTSTART:20110101T120000Z
-DTEND:20110101T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
- $h = fopen('php://memory', 'r+');
- fwrite($h, $blob);
- rewind($h);
-
-
- $this->assertFreeBusyReport(
- "FREEBUSY:20110101T120000Z/20110101T130000Z",
- $h
- );
-
- }
-
- /**
- * Testing TRANSP:OPAQUE
- */
- function testOpaque() {
-
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar2
-TRANSP:OPAQUE
-DTSTART:20110101T130000Z
-DTEND:20110101T140000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- "FREEBUSY:20110101T130000Z/20110101T140000Z",
- $blob
- );
-
- }
-
- /**
- * Testing TRANSP:TRANSPARENT
- */
- function testTransparent() {
-
- // transparent, hidden
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar3
-TRANSP:TRANSPARENT
-DTSTART:20110101T140000Z
-DTEND:20110101T150000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- "",
- $blob
- );
-
- }
-
- /**
- * Testing STATUS:CANCELLED
- */
- function testCancelled() {
-
- // transparent, hidden
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar4
-STATUS:CANCELLED
-DTSTART:20110101T160000Z
-DTEND:20110101T170000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- "",
- $blob
- );
-
- }
-
- /**
- * Testing STATUS:TENTATIVE
- */
- function testTentative() {
-
- // tentative, shows up
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar5
-STATUS:TENTATIVE
-DTSTART:20110101T180000Z
-DTEND:20110101T190000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- 'FREEBUSY;FBTYPE=BUSY-TENTATIVE:20110101T180000Z/20110101T190000Z',
- $blob
- );
-
- }
-
- /**
- * Testing an event that falls outside of the report time-range.
- */
- function testOutsideTimeRange() {
-
- // outside of time-range, hidden
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar6
-DTSTART:20110101T090000Z
-DTEND:20110101T100000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- '',
- $blob
- );
-
- }
-
- /**
- * Testing an event that falls outside of the report time-range.
- */
- function testOutsideTimeRange2() {
-
- // outside of time-range, hidden
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar7
-DTSTART:20110104T090000Z
-DTEND:20110104T100000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- '',
- $blob
- );
-
- }
-
- /**
- * Testing an event that uses DURATION
- */
- function testDuration() {
-
- // using duration, shows up
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar8
-DTSTART:20110101T190000Z
-DURATION:PT1H
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- 'FREEBUSY:20110101T190000Z/20110101T200000Z',
- $blob
- );
-
- }
-
- /**
- * Testing an all-day event
- */
- function testAllDay() {
-
- // Day-long event, shows up
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar9
-DTSTART;VALUE=DATE:20110102
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- 'FREEBUSY:20110102T000000Z/20110103T000000Z',
- $blob
- );
-
- }
-
- /**
- * Testing an event that has no end or duration.
- */
- function testNoDuration() {
-
- // No duration, does not show up
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar10
-DTSTART:20110101T200000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- '',
- $blob
- );
-
- }
-
- /**
- * Testing feeding the freebusy generator an object instead of a string.
- */
- function testObject() {
-
- // encoded as object, shows up
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar11
-DTSTART:20110101T210000Z
-DURATION:PT1H
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- 'FREEBUSY:20110101T210000Z/20110101T220000Z',
- Reader::read($blob)
- );
-
-
- }
-
- /**
- * Testing feeding VFREEBUSY objects instead of VEVENT
- */
- function testVFreeBusy() {
-
- // Freebusy. Some parts show up
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VFREEBUSY
-FREEBUSY:20110103T010000Z/20110103T020000Z
-FREEBUSY;FBTYPE=FREE:20110103T020000Z/20110103T030000Z
-FREEBUSY:20110103T030000Z/20110103T040000Z,20110103T040000Z/20110103T050000Z
-FREEBUSY:20120101T000000Z/20120101T010000Z
-FREEBUSY:20110103T050000Z/PT1H
-END:VFREEBUSY
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- "FREEBUSY:20110103T010000Z/20110103T020000Z\n" .
- 'FREEBUSY:20110103T030000Z/20110103T060000Z',
- $blob
- );
-
- }
-
- function testYearlyRecurrence() {
-
- // Yearly recurrence rule, shows up
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar13
-DTSTART:20100101T220000Z
-DTEND:20100101T230000Z
-RRULE:FREQ=YEARLY
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- 'FREEBUSY:20110101T220000Z/20110101T230000Z',
- $blob
- );
-
- }
-
- function testYearlyRecurrenceDuration() {
-
- // Yearly recurrence rule + duration, shows up
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar14
-DTSTART:20100101T230000Z
-DURATION:PT1H
-RRULE:FREQ=YEARLY
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- 'FREEBUSY:20110101T230000Z/20110102T000000Z',
- $blob
- );
-
- }
-
- function testFloatingTime() {
-
- // Floating time, no timezone
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar
-DTSTART:20110101T120000
-DTEND:20110101T130000
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- "FREEBUSY:20110101T120000Z/20110101T130000Z",
- $blob
- );
-
- }
-
- function testFloatingTimeReferenceTimeZone() {
-
- // Floating time + reference timezone
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar
-DTSTART:20110101T120000
-DTEND:20110101T130000
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- "FREEBUSY:20110101T170000Z/20110101T180000Z",
- $blob,
- new \DateTimeZone('America/Toronto')
- );
-
- }
-
- function testAllDay2() {
-
- // All-day event, slightly outside of the VFREEBUSY range.
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar
-DTSTART;VALUE=DATE:20110101
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- "FREEBUSY:20110101T110000Z/20110102T000000Z",
- $blob
- );
-
- }
-
- function testAllDayReferenceTimeZone() {
-
- // All-day event + reference timezone
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar
-DTSTART;VALUE=DATE:20110101
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- "FREEBUSY:20110101T110000Z/20110102T050000Z",
- $blob,
- new \DateTimeZone('America/Toronto')
- );
-
- }
-
- function testNoValidInstances() {
-
- // Recurrence rule with no valid instances
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar
-DTSTART:20110101T100000Z
-DTEND:20110103T120000Z
-RRULE:FREQ=WEEKLY;COUNT=1
-EXDATE:20110101T100000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- "",
- $blob
- );
-
- }
-
- /**
- * This VAVAILABILITY object overlaps with the time-range, but we're just
- * busy the entire time.
- */
- function testVAvailabilitySimple() {
-
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:lalala
-DTSTART:20110101T120000Z
-DTEND:20110101T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $vavail = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VAVAILABILITY
-DTSTART:20110101T000000Z
-DTEND:20120101T000000Z
-BEGIN:AVAILABLE
-DTSTART:20110101T000000Z
-DTEND:20110101T010000Z
-END:AVAILABLE
-END:VAVAILABILITY
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- "FREEBUSY;FBTYPE=BUSY-UNAVAILABLE:20110101T110000Z/20110101T120000Z\n" .
- "FREEBUSY:20110101T120000Z/20110101T130000Z\n" .
- "FREEBUSY;FBTYPE=BUSY-UNAVAILABLE:20110101T130000Z/20110103T110000Z",
- $blob,
- null,
- $vavail
- );
-
- }
-
- /**
- * This VAVAILABILITY object does not overlap at all with the freebusy
- * report, so it should be ignored.
- */
- function testVAvailabilityIrrelevant() {
-
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:lalala
-DTSTART:20110101T120000Z
-DTEND:20110101T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $vavail = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VAVAILABILITY
-DTSTART:20150101T000000Z
-DTEND:20160101T000000Z
-BEGIN:AVAILABLE
-DTSTART:20150101T000000Z
-DTEND:20150101T010000Z
-END:AVAILABLE
-END:VAVAILABILITY
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- "FREEBUSY:20110101T120000Z/20110101T130000Z",
- $blob,
- null,
- $vavail
- );
-
- }
-
- /**
- * This VAVAILABILITY object has a 9am-5pm AVAILABLE object for office
- * hours.
- */
- function testVAvailabilityOfficeHours() {
-
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:lalala
-DTSTART:20110101T120000Z
-DTEND:20110101T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $vavail = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VAVAILABILITY
-DTSTART:20100101T000000Z
-DTEND:20120101T000000Z
-BUSYTYPE:BUSY-TENTATIVE
-BEGIN:AVAILABLE
-DTSTART:20101213T090000Z
-DTEND:20101213T170000Z
-RRULE:FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR
-END:AVAILABLE
-END:VAVAILABILITY
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- "FREEBUSY;FBTYPE=BUSY-TENTATIVE:20110101T110000Z/20110101T120000Z\n" .
- "FREEBUSY:20110101T120000Z/20110101T130000Z\n" .
- "FREEBUSY;FBTYPE=BUSY-TENTATIVE:20110101T130000Z/20110103T090000Z\n",
- $blob,
- null,
- $vavail
- );
-
- }
-
- /**
- * This test has the same office hours, but has a vacation blocked off for
- * the relevant time, using a higher priority. (lower number).
- */
- function testVAvailabilityOfficeHoursVacation() {
-
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:lalala
-DTSTART:20110101T120000Z
-DTEND:20110101T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $vavail = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VAVAILABILITY
-DTSTART:20100101T000000Z
-DTEND:20120101T000000Z
-BUSYTYPE:BUSY-TENTATIVE
-PRIORITY:2
-BEGIN:AVAILABLE
-DTSTART:20101213T090000Z
-DTEND:20101213T170000Z
-RRULE:FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR
-END:AVAILABLE
-END:VAVAILABILITY
-BEGIN:VAVAILABILITY
-PRIORITY:1
-DTSTART:20101214T000000Z
-DTEND:20110107T000000Z
-BUSYTYPE:BUSY
-END:VAVAILABILITY
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- "FREEBUSY:20110101T110000Z/20110103T110000Z",
- $blob,
- null,
- $vavail
- );
-
- }
-
- /**
- * This test has the same input as the last, except somebody mixed up the
- * PRIORITY values.
- *
- * The end-result is that the vacation VAVAILABILITY is completely ignored.
- */
- function testVAvailabilityOfficeHoursVacation2() {
-
- $blob = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:lalala
-DTSTART:20110101T120000Z
-DTEND:20110101T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $vavail = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VAVAILABILITY
-DTSTART:20100101T000000Z
-DTEND:20120101T000000Z
-BUSYTYPE:BUSY-TENTATIVE
-PRIORITY:1
-BEGIN:AVAILABLE
-DTSTART:20101213T090000Z
-DTEND:20101213T170000Z
-RRULE:FREQ=WEEKLY;BYDAY=MO,TU,WE,TH,FR
-END:AVAILABLE
-END:VAVAILABILITY
-BEGIN:VAVAILABILITY
-PRIORITY:2
-DTSTART:20101214T000000Z
-DTEND:20110107T000000Z
-BUSYTYPE:BUSY
-END:VAVAILABILITY
-END:VCALENDAR
-ICS;
-
- $this->assertFreeBusyReport(
- "FREEBUSY;FBTYPE=BUSY-TENTATIVE:20110101T110000Z/20110101T120000Z\n" .
- "FREEBUSY:20110101T120000Z/20110101T130000Z\n" .
- "FREEBUSY;FBTYPE=BUSY-TENTATIVE:20110101T130000Z/20110103T090000Z\n",
- $blob,
- null,
- $vavail
- );
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/GoogleColonEscapingTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/GoogleColonEscapingTest.php
deleted file mode 100644
index ee37aa8875e..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/GoogleColonEscapingTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-/**
- * Google produces vcards with a weird escaping of urls.
- *
- * VObject will provide a workaround for this, so end-user still get expected
- * values.
- */
-class GoogleColonEscapingTest extends \PHPUnit_Framework_TestCase {
-
- function testDecode() {
-
- $vcard = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-FN:Evert Pot
-N:Pot;Evert;;;
-EMAIL;TYPE=INTERNET;TYPE=WORK:evert@fruux.com
-BDAY:1985-04-07
-item7.URL:http\://www.rooftopsolutions.nl/
-END:VCARD
-VCF;
-
- $vobj = Reader::read($vcard);
- $this->assertEquals('http://www.rooftopsolutions.nl/', $vobj->URL->getValue());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ICalendar/AttachParseTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/ICalendar/AttachParseTest.php
deleted file mode 100644
index 0c4fc8790e5..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ICalendar/AttachParseTest.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-namespace Sabre\VObject\ICalendar;
-
-use Sabre\VObject\Reader;
-
-class AttachParseTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * See issue #128 for more info.
- */
- function testParseAttach() {
-
- $vcal = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-ATTACH;FMTTYPE=application/postscript:ftp://example.com/pub/reports/r-960812.ps
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $vcal = Reader::read($vcal);
- $prop = $vcal->VEVENT->ATTACH;
-
- $this->assertInstanceOf('Sabre\\VObject\\Property\\URI', $prop);
- $this->assertEquals('ftp://example.com/pub/reports/r-960812.ps', $prop->getValue());
-
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerAttendeeReplyTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerAttendeeReplyTest.php
deleted file mode 100644
index 9519ed36828..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerAttendeeReplyTest.php
+++ /dev/null
@@ -1,1146 +0,0 @@
-<?php
-
-namespace Sabre\VObject\ITip;
-
-class BrokerAttendeeReplyTest extends BrokerTester {
-
- function testAccepted() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SUMMARY:B-day party
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-DTSTART:20140716T120000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SUMMARY:B-day party
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=ACCEPTED;CN=One:mailto:one@example.org
-DTSTART:20140716T120000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one@example.org',
- 'senderName' => 'One',
- 'recipient' => 'mailto:strunk@example.org',
- 'recipientName' => 'Strunk',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REPLY
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART:20140716T120000Z
-SUMMARY:B-day party
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=ACCEPTED;CN=One:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
-
- ];
-
- $this->parse($oldMessage, $newMessage, $expected);
-
- }
-
- function testRecurringReply() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-DTSTART:20140724T120000Z
-SUMMARY:Daily sprint
-RRULE;FREQ=DAILY
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=NEEDS-ACTION;CN=One:mailto:one@example.org
-DTSTART:20140724T120000Z
-SUMMARY:Daily sprint
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=ACCEPTED;CN=One:mailto:one@example.org
-DTSTART:20140726T120000Z
-RECURRENCE-ID:20140726T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=DECLINED;CN=One:mailto:one@example.org
-DTSTART:20140724T120000Z
-RECURRENCE-ID:20140724T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=TENTATIVE;CN=One:mailto:one@example.org
-DTSTART:20140728T120000Z
-RECURRENCE-ID:20140728T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=ACCEPTED;CN=One:mailto:one@example.org
-DTSTART:20140729T120000Z
-RECURRENCE-ID:20140729T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=DECLINED;CN=One:mailto:one@example.org
-DTSTART:20140725T120000Z
-RECURRENCE-ID:20140725T120000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one@example.org',
- 'senderName' => 'One',
- 'recipient' => 'mailto:strunk@example.org',
- 'recipientName' => 'Strunk',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REPLY
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART:20140726T120000Z
-SUMMARY:Daily sprint
-RECURRENCE-ID:20140726T120000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=ACCEPTED;CN=One:mailto:one@example.org
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART:20140724T120000Z
-SUMMARY:Daily sprint
-RECURRENCE-ID:20140724T120000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=DECLINED;CN=One:mailto:one@example.org
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART:20140728T120000Z
-SUMMARY:Daily sprint
-RECURRENCE-ID:20140728T120000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=TENTATIVE;CN=One:mailto:one@example.org
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART:20140729T120000Z
-SUMMARY:Daily sprint
-RECURRENCE-ID:20140729T120000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=ACCEPTED;CN=One:mailto:one@example.org
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART:20140725T120000Z
-SUMMARY:Daily sprint
-RECURRENCE-ID:20140725T120000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=DECLINED;CN=One:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
-
- ];
-
- $this->parse($oldMessage, $newMessage, $expected);
-
- }
-
- function testRecurringAllDay() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-DTSTART;VALUE=DATE:20140724
-RRULE;FREQ=DAILY
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=NEEDS-ACTION;CN=One:mailto:one@example.org
-DTSTART;VALUE=DATE:20140724
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=ACCEPTED;CN=One:mailto:one@example.org
-DTSTART;VALUE=DATE:20140726
-RECURRENCE-ID;VALUE=DATE:20140726
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=DECLINED;CN=One:mailto:one@example.org
-DTSTART;VALUE=DATE:20140724
-RECURRENCE-ID;VALUE=DATE:20140724
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=TENTATIVE;CN=One:mailto:one@example.org
-DTSTART;VALUE=DATE:20140728
-RECURRENCE-ID;VALUE=DATE:20140728
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=ACCEPTED;CN=One:mailto:one@example.org
-DTSTART;VALUE=DATE:20140729
-RECURRENCE-ID;VALUE=DATE:20140729
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=DECLINED;CN=One:mailto:one@example.org
-DTSTART;VALUE=DATE:20140725
-RECURRENCE-ID;VALUE=DATE:20140725
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one@example.org',
- 'senderName' => 'One',
- 'recipient' => 'mailto:strunk@example.org',
- 'recipientName' => 'Strunk',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REPLY
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART;VALUE=DATE:20140726
-RECURRENCE-ID;VALUE=DATE:20140726
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=ACCEPTED;CN=One:mailto:one@example.org
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART;VALUE=DATE:20140724
-RECURRENCE-ID;VALUE=DATE:20140724
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=DECLINED;CN=One:mailto:one@example.org
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART;VALUE=DATE:20140728
-RECURRENCE-ID;VALUE=DATE:20140728
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=TENTATIVE;CN=One:mailto:one@example.org
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART;VALUE=DATE:20140729
-RECURRENCE-ID;VALUE=DATE:20140729
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=ACCEPTED;CN=One:mailto:one@example.org
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART;VALUE=DATE:20140725
-RECURRENCE-ID;VALUE=DATE:20140725
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=DECLINED;CN=One:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
-
- ];
-
- $this->parse($oldMessage, $newMessage, $expected);
-
- }
-
- function testNoChange() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-DTSTART:20140716T120000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=NEEDS-ACTION;CN=One:mailto:one@example.org
-DTSTART:20140716T120000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $expected = [];
- $this->parse($oldMessage, $newMessage, $expected);
-
- }
-
- function testNoChangeForceSend() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-DTSTART:20140716T120000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;SCHEDULE-FORCE-SEND=REPLY;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=NEEDS-ACTION;CN=One:mailto:one@example.org
-DTSTART:20140716T120000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one@example.org',
- 'senderName' => 'One',
- 'recipient' => 'mailto:strunk@example.org',
- 'recipientName' => 'Strunk',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REPLY
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART:20140716T120000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=NEEDS-ACTION;CN=One:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
- ]
-
- ];
- $this->parse($oldMessage, $newMessage, $expected);
-
- }
-
- function testNoRelevantAttendee() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-DTSTART:20140716T120000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Two:mailto:two@example.org
-DTSTART:20140716T120000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $expected = [];
- $this->parse($oldMessage, $newMessage, $expected);
-
- }
-
- /**
- * In this test, an event exists in an attendees calendar. The event
- * is recurring, and the attendee deletes 1 instance of the event.
- * This instance shows up in EXDATE
- *
- * This should automatically generate a DECLINED message for that
- * specific instance.
- */
- function testCreateReplyByException() {
-
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-DTSTART:20140811T200000Z
-RRULE:FREQ=WEEKLY
-ORGANIZER:mailto:organizer@example.org
-ATTENDEE:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-DTSTART:20140811T200000Z
-RRULE:FREQ=WEEKLY
-ORGANIZER:mailto:organizer@example.org
-ATTENDEE:mailto:one@example.org
-EXDATE:20140818T200000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one@example.org',
- 'senderName' => null,
- 'recipient' => 'mailto:organizer@example.org',
- 'recipientName' => null,
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REPLY
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART:20140818T200000Z
-RECURRENCE-ID:20140818T200000Z
-ORGANIZER:mailto:organizer@example.org
-ATTENDEE;PARTSTAT=DECLINED:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- ];
- $this->parse($oldMessage, $newMessage, $expected);
-
- }
-
- /**
- * This test is identical to the last, but now we're working with
- * timezones.
- *
- * @depends testCreateReplyByException
- */
- function testCreateReplyByExceptionTz() {
-
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-DTSTART;TZID=America/Toronto:20140811T200000
-RRULE:FREQ=WEEKLY
-ORGANIZER:mailto:organizer@example.org
-ATTENDEE:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-DTSTART;TZID=America/Toronto:20140811T200000
-RRULE:FREQ=WEEKLY
-ORGANIZER:mailto:organizer@example.org
-ATTENDEE:mailto:one@example.org
-EXDATE;TZID=America/Toronto:20140818T200000
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one@example.org',
- 'senderName' => null,
- 'recipient' => 'mailto:organizer@example.org',
- 'recipientName' => null,
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REPLY
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART;TZID=America/Toronto:20140818T200000
-RECURRENCE-ID;TZID=America/Toronto:20140818T200000
-ORGANIZER:mailto:organizer@example.org
-ATTENDEE;PARTSTAT=DECLINED:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- ];
- $this->parse($oldMessage, $newMessage, $expected);
-
- }
-
- /**
- * @depends testCreateReplyByException
- */
- function testCreateReplyByExceptionAllDay() {
-
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SUMMARY:Weekly meeting
-UID:foobar
-SEQUENCE:1
-DTSTART;VALUE=DATE:20140811
-RRULE:FREQ=WEEKLY
-ORGANIZER:mailto:organizer@example.org
-ATTENDEE:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SUMMARY:Weekly meeting
-UID:foobar
-SEQUENCE:1
-DTSTART;VALUE=DATE:20140811
-RRULE:FREQ=WEEKLY
-ORGANIZER:mailto:organizer@example.org
-ATTENDEE:mailto:one@example.org
-EXDATE;VALUE=DATE:20140818
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one@example.org',
- 'senderName' => null,
- 'recipient' => 'mailto:organizer@example.org',
- 'recipientName' => null,
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REPLY
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART;VALUE=DATE:20140818
-SUMMARY:Weekly meeting
-RECURRENCE-ID;VALUE=DATE:20140818
-ORGANIZER:mailto:organizer@example.org
-ATTENDEE;PARTSTAT=DECLINED:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- ];
- $this->parse($oldMessage, $newMessage, $expected);
-
- }
-
- function testDeclined() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-DTSTART:20140716T120000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=DECLINED;CN=One:mailto:one@example.org
-DTSTART:20140716T120000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one@example.org',
- 'senderName' => 'One',
- 'recipient' => 'mailto:strunk@example.org',
- 'recipientName' => 'Strunk',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REPLY
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART:20140716T120000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=DECLINED;CN=One:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
-
- ];
-
- $this->parse($oldMessage, $newMessage, $expected);
-
- }
-
- function testDeclinedCancelledEvent() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-STATUS:CANCELLED
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-DTSTART:20140716T120000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-STATUS:CANCELLED
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=DECLINED;CN=One:mailto:one@example.org
-DTSTART:20140716T120000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [];
-
- $this->parse($oldMessage, $newMessage, $expected);
-
- }
-
- /**
- * In this test, a new exception is created by an attendee as well.
- *
- * Except in this case, there was already an overridden event, and the
- * overridden event was marked as cancelled by the attendee.
- *
- * For any other attendence status, the new status would have been
- * declined, but for this, no message should we sent.
- */
- function testDontCreateReplyWhenEventWasDeclined() {
-
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-DTSTART:20140811T200000Z
-RRULE:FREQ=WEEKLY
-ORGANIZER:mailto:organizer@example.org
-ATTENDEE:mailto:one@example.org
-END:VEVENT
-BEGIN:VEVENT
-RECURRENCE-ID:20140818T200000Z
-UID:foobar
-SEQUENCE:1
-DTSTART:20140818T200000Z
-RRULE:FREQ=WEEKLY
-ORGANIZER:mailto:organizer@example.org
-ATTENDEE;PARTSTAT=DECLINED:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-DTSTART:20140811T200000Z
-RRULE:FREQ=WEEKLY
-ORGANIZER:mailto:organizer@example.org
-ATTENDEE:mailto:one@example.org
-EXDATE:20140818T200000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $expected = [];
-
- $this->parse($oldMessage, $newMessage, $expected);
-
- }
-
- function testScheduleAgentOnOrganizer() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-DTSTART:20140716T120000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;SCHEDULE-AGENT=CLIENT;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=ACCEPTED;CN=One:mailto:one@example.org
-DTSTART:20140716T120000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [];
- $this->parse($oldMessage, $newMessage, $expected);
-
- }
-
- function testAcceptedAllDay() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-DTSTART;VALUE=DATE:20140716
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=ACCEPTED;CN=One:mailto:one@example.org
-DTSTART;VALUE=DATE:20140716
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one@example.org',
- 'senderName' => 'One',
- 'recipient' => 'mailto:strunk@example.org',
- 'recipientName' => 'Strunk',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REPLY
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART;VALUE=DATE:20140716
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=ACCEPTED;CN=One:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
-
- ];
-
- $this->parse($oldMessage, $newMessage, $expected);
-
- }
-
- /**
- * This function tests an attendee updating their status to an event where
- * they don't have the master event of.
- *
- * This is possible in cases an organizer created a recurring event, and
- * invited an attendee for one instance of the event.
- */
- function testReplyNoMasterEvent() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-RECURRENCE-ID:20140724T120000Z
-DTSTART:20140724T120000Z
-SUMMARY:Daily sprint
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=ACCEPTED;CN=One:mailto:one@example.org
-RECURRENCE-ID:20140724T120000Z
-DTSTART:20140724T120000Z
-SUMMARY:Daily sprint
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one@example.org',
- 'senderName' => 'One',
- 'recipient' => 'mailto:strunk@example.org',
- 'recipientName' => 'Strunk',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-METHOD:REPLY
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART:20140724T120000Z
-SUMMARY:Daily sprint
-RECURRENCE-ID:20140724T120000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=ACCEPTED;CN=One:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
-
- ];
-
- $this->parse($oldMessage, $newMessage, $expected);
-
- }
-
- /**
- * A party crasher is an attendee that accepted an event, but was not in
- * any original invite.
- *
- * @depends testAccepted
- */
- function testPartyCrasher() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SUMMARY:B-day party
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-DTSTART:20140716T120000Z
-RRULE:FREQ=DAILY
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-RECURRENCE-ID:20140717T120000Z
-SUMMARY:B-day party
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-DTSTART:20140717T120000Z
-RRULE:FREQ=DAILY
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SUMMARY:B-day party
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-DTSTART:20140716T120000Z
-RRULE:FREQ=DAILY
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-RECURRENCE-ID:20140717T120000Z
-SUMMARY:B-day party
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=ACCEPTED;CN=One:mailto:one@example.org
-DTSTART:20140717T120000Z
-RRULE:FREQ=DAILY
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one@example.org',
- 'senderName' => 'One',
- 'recipient' => 'mailto:strunk@example.org',
- 'recipientName' => 'Strunk',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-METHOD:REPLY
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART:20140717T120000Z
-SUMMARY:B-day party
-RECURRENCE-ID:20140717T120000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=ACCEPTED;CN=One:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-
-ICS
-
- ],
-
- ];
-
- $this->parse($oldMessage, $newMessage, $expected);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerDeleteEventTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerDeleteEventTest.php
deleted file mode 100644
index 935c451fe76..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerDeleteEventTest.php
+++ /dev/null
@@ -1,344 +0,0 @@
-<?php
-
-namespace Sabre\VObject\ITip;
-
-class BrokerDeleteEventTest extends BrokerTester {
-
- function testOrganizerDeleteWithDtend() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-SUMMARY:foo
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = null;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'CANCEL',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one@example.org',
- 'recipientName' => 'One',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:CANCEL
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:2
-SUMMARY:foo
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
- ],
-
- [
- 'uid' => 'foobar',
- 'method' => 'CANCEL',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:two@example.org',
- 'recipientName' => 'Two',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:CANCEL
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:2
-SUMMARY:foo
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- ];
-
- $this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk@example.org');
-
- }
-
- function testOrganizerDeleteWithDuration() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-SUMMARY:foo
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-DTSTART:20140716T120000Z
-DURATION:PT1H
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = null;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'CANCEL',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one@example.org',
- 'recipientName' => 'One',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:CANCEL
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:2
-SUMMARY:foo
-DTSTART:20140716T120000Z
-DURATION:PT1H
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
- ],
-
- [
- 'uid' => 'foobar',
- 'method' => 'CANCEL',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:two@example.org',
- 'recipientName' => 'Two',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:CANCEL
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:2
-SUMMARY:foo
-DTSTART:20140716T120000Z
-DURATION:PT1H
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- ];
-
- $this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk@example.org');
-
- }
-
- function testAttendeeDeleteWithDtend() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-SUMMARY:foo
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = null;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one@example.org',
- 'senderName' => 'One',
- 'recipient' => 'mailto:strunk@example.org',
- 'recipientName' => 'Strunk',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REPLY
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-SUMMARY:foo
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=DECLINED;CN=One:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
- ],
- ];
-
- $this->parse($oldMessage, $newMessage, $expected, 'mailto:one@example.org');
-
-
- }
-
- function testAttendeeReplyWithDuration() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-SUMMARY:foo
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-DTSTART:20140716T120000Z
-DURATION:PT1H
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = null;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REPLY',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:one@example.org',
- 'senderName' => 'One',
- 'recipient' => 'mailto:strunk@example.org',
- 'recipientName' => 'Strunk',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REPLY
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART:20140716T120000Z
-DURATION:PT1H
-SUMMARY:foo
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;PARTSTAT=DECLINED;CN=One:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
- ],
- ];
-
- $this->parse($oldMessage, $newMessage, $expected, 'mailto:one@example.org');
-
-
- }
-
- function testAttendeeDeleteCancelledEvent() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-STATUS:CANCELLED
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = null;
-
- $expected = [];
-
- $this->parse($oldMessage, $newMessage, $expected, 'mailto:one@example.org');
-
-
- }
-
- function testNoCalendar() {
-
- $this->parse(null, null, [], 'mailto:one@example.org');
-
- }
-
- function testVTodo() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VTODO
-UID:foobar
-SEQUENCE:1
-END:VTODO
-END:VCALENDAR
-ICS;
- $this->parse($oldMessage, null, [], 'mailto:one@example.org');
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerNewEventTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerNewEventTest.php
deleted file mode 100644
index 05cf452a85c..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerNewEventTest.php
+++ /dev/null
@@ -1,496 +0,0 @@
-<?php
-
-namespace Sabre\VObject\ITip;
-
-class BrokerNewEventTest extends BrokerTester {
-
- function testNoAttendee() {
-
- $message = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar
-DTSTART:20140811T220000Z
-DTEND:20140811T230000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $result = $this->parse(null, $message, []);
-
- }
-
- function testVTODO() {
-
- $message = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VTODO
-UID:foobar
-END:VTODO
-END:VCALENDAR
-ICS;
-
- $result = $this->parse(null, $message, []);
-
- }
-
- function testSimpleInvite() {
-
- $message = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-DTSTART:20140811T220000Z
-DTEND:20140811T230000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=White:mailto:white@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
- $expectedMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REQUEST
-BEGIN:VEVENT
-UID:foobar
-DTSTART:20140811T220000Z
-DTEND:20140811T230000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=White;PARTSTAT=NEEDS-ACTION:mailto:white@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:white@example.org',
- 'recipientName' => 'White',
- 'message' => $expectedMessage,
- ],
- ];
-
- $this->parse(null, $message, $expected, 'mailto:strunk@example.org');
-
- }
-
- /**
- * @expectedException \Sabre\VObject\ITip\ITipException
- */
- function testBrokenEventUIDMisMatch() {
-
- $message = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=White:mailto:white@example.org
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar2
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=White:mailto:white@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->parse(null, $message, [], 'mailto:strunk@example.org');
-
- }
- /**
- * @expectedException \Sabre\VObject\ITip\ITipException
- */
- function testBrokenEventOrganizerMisMatch() {
-
- $message = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=White:mailto:white@example.org
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-ORGANIZER:mailto:foo@example.org
-ATTENDEE;CN=White:mailto:white@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->parse(null, $message, [], 'mailto:strunk@example.org');
-
- }
-
- function testRecurrenceInvite() {
-
- $message = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-DTSTART:20140716T120000Z
-DURATION:PT1H
-RRULE:FREQ=DAILY
-EXDATE:20140717T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-RECURRENCE-ID:20140718T120000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-ATTENDEE;CN=Three:mailto:three@example.org
-DTSTART:20140718T120000Z
-DURATION:PT1H
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one@example.org',
- 'recipientName' => 'One',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REQUEST
-BEGIN:VEVENT
-UID:foobar
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One;PARTSTAT=NEEDS-ACTION:mailto:one@example.org
-ATTENDEE;CN=Two;PARTSTAT=NEEDS-ACTION:mailto:two@example.org
-DTSTART:20140716T120000Z
-DURATION:PT1H
-RRULE:FREQ=DAILY
-EXDATE:20140717T120000Z,20140718T120000Z
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- [
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:two@example.org',
- 'recipientName' => 'Two',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REQUEST
-BEGIN:VEVENT
-UID:foobar
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One;PARTSTAT=NEEDS-ACTION:mailto:one@example.org
-ATTENDEE;CN=Two;PARTSTAT=NEEDS-ACTION:mailto:two@example.org
-DTSTART:20140716T120000Z
-DURATION:PT1H
-RRULE:FREQ=DAILY
-EXDATE:20140717T120000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-RECURRENCE-ID:20140718T120000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-ATTENDEE;CN=Three:mailto:three@example.org
-DTSTART:20140718T120000Z
-DURATION:PT1H
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- [
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:three@example.org',
- 'recipientName' => 'Three',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REQUEST
-BEGIN:VEVENT
-UID:foobar
-RECURRENCE-ID:20140718T120000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-ATTENDEE;CN=Three:mailto:three@example.org
-DTSTART:20140718T120000Z
-DURATION:PT1H
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- ];
-
- $this->parse(null, $message, $expected, 'mailto:strunk@example.org');
-
- }
-
- function testRecurrenceInvite2() {
-
- // This method tests a nearly identical path, but in this case the
- // master event does not have an EXDATE.
- $message = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-RRULE:FREQ=DAILY
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-RECURRENCE-ID:20140718T120000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-ATTENDEE;CN=Three:mailto:three@example.org
-DTSTART:20140718T120000Z
-DTEND:20140718T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one@example.org',
- 'recipientName' => 'One',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REQUEST
-BEGIN:VEVENT
-UID:foobar
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One;PARTSTAT=NEEDS-ACTION:mailto:one@example.org
-ATTENDEE;CN=Two;PARTSTAT=NEEDS-ACTION:mailto:two@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-RRULE:FREQ=DAILY
-EXDATE:20140718T120000Z
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- [
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:two@example.org',
- 'recipientName' => 'Two',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REQUEST
-BEGIN:VEVENT
-UID:foobar
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One;PARTSTAT=NEEDS-ACTION:mailto:one@example.org
-ATTENDEE;CN=Two;PARTSTAT=NEEDS-ACTION:mailto:two@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-RRULE:FREQ=DAILY
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-RECURRENCE-ID:20140718T120000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-ATTENDEE;CN=Three:mailto:three@example.org
-DTSTART:20140718T120000Z
-DTEND:20140718T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- [
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:three@example.org',
- 'recipientName' => 'Three',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REQUEST
-BEGIN:VEVENT
-UID:foobar
-RECURRENCE-ID:20140718T120000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-ATTENDEE;CN=Three:mailto:three@example.org
-DTSTART:20140718T120000Z
-DTEND:20140718T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- ];
-
- $this->parse(null, $message, $expected, 'mailto:strunk@example.org');
-
- }
-
- function testScheduleAgentClient() {
-
- $message = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-DTSTART:20140811T220000Z
-DTEND:20140811T230000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=White;SCHEDULE-AGENT=CLIENT:mailto:white@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $this->parse(null, $message, [], 'mailto:strunk@example.org');
-
- }
-
- /**
- * @expectedException Sabre\VObject\ITip\ITipException
- */
- function testMultipleUID() {
-
- $message = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-RRULE:FREQ=DAILY
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar2
-RECURRENCE-ID:20140718T120000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-ATTENDEE;CN=Three:mailto:three@example.org
-DTSTART:20140718T120000Z
-DTEND:20140718T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
- $this->parse(null, $message, [], 'mailto:strunk@example.org');
-
- }
-
- /**
- * @expectedException Sabre\VObject\ITip\SameOrganizerForAllComponentsException
- */
- function testChangingOrganizers() {
-
- $message = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-RRULE:FREQ=DAILY
-END:VEVENT
-BEGIN:VEVENT
-UID:foobar
-RECURRENCE-ID:20140718T120000Z
-ORGANIZER;CN=Strunk:mailto:ew@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-ATTENDEE;CN=Three:mailto:three@example.org
-DTSTART:20140718T120000Z
-DTEND:20140718T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
- $this->parse(null, $message, [], 'mailto:strunk@example.org');
-
- }
- function testNoOrganizerHasAttendee() {
-
- $message = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar
-DTSTART:20140811T220000Z
-DTEND:20140811T230000Z
-ATTENDEE;CN=Two:mailto:two@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->parse(null, $message, [], 'mailto:strunk@example.org');
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerProcessMessageTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerProcessMessageTest.php
deleted file mode 100644
index 691574a8991..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerProcessMessageTest.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-
-namespace Sabre\VObject\ITip;
-
-class BrokerProcessMessageTest extends BrokerTester {
-
- function testRequestNew() {
-
- $itip = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:REQUEST
-BEGIN:VEVENT
-SEQUENCE:1
-UID:foobar
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SEQUENCE:1
-UID:foobar
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $result = $this->process($itip, null, $expected);
-
- }
-
- function testRequestUpdate() {
-
- $itip = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:REQUEST
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $old = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-SEQUENCE:1
-UID:foobar
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $result = $this->process($itip, $old, $expected);
-
- }
-
- function testCancel() {
-
- $itip = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:CANCEL
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $old = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-SEQUENCE:1
-UID:foobar
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:foobar
-STATUS:CANCELLED
-SEQUENCE:2
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $result = $this->process($itip, $old, $expected);
-
- }
-
- function testCancelNoExistingEvent() {
-
- $itip = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:CANCEL
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $old = null;
- $expected = null;
-
- $result = $this->process($itip, $old, $expected);
-
- }
-
- function testUnsupportedComponent() {
-
- $itip = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VTODO
-SEQUENCE:2
-UID:foobar
-END:VTODO
-END:VCALENDAR
-ICS;
-
- $old = null;
- $expected = null;
-
- $result = $this->process($itip, $old, $expected);
-
- }
-
- function testUnsupportedMethod() {
-
- $itip = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:PUBLISH
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $old = null;
- $expected = null;
-
- $result = $this->process($itip, $old, $expected);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerProcessReplyTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerProcessReplyTest.php
deleted file mode 100644
index 533fdce1512..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerProcessReplyTest.php
+++ /dev/null
@@ -1,496 +0,0 @@
-<?php
-
-namespace Sabre\VObject\ITip;
-
-class BrokerProcessReplyTest extends BrokerTester {
-
- function testReplyNoOriginal() {
-
- $itip = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:REPLY
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-ATTENDEE;PARTSTAT=ACCEPTED:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $old = null;
- $expected = null;
-
- $result = $this->process($itip, $old, $expected);
-
- }
-
- function testReplyAccept() {
-
- $itip = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:REPLY
-BEGIN:VEVENT
-ATTENDEE;PARTSTAT=ACCEPTED:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-SEQUENCE:2
-UID:foobar
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $old = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-ATTENDEE:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $result = $this->process($itip, $old, $expected);
-
- }
-
- function testReplyRequestStatus() {
-
- $itip = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:REPLY
-BEGIN:VEVENT
-UID:foobar
-REQUEST-STATUS:2.3;foo-bar!
-ATTENDEE;PARTSTAT=ACCEPTED:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-SEQUENCE:2
-UID:foobar
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $old = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:2
-ATTENDEE:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:2
-ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.3:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $result = $this->process($itip, $old, $expected);
-
- }
-
-
- function testReplyPartyCrasher() {
-
- $itip = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:REPLY
-BEGIN:VEVENT
-ATTENDEE;PARTSTAT=ACCEPTED:mailto:crasher@example.org
-ORGANIZER:mailto:bar@example.org
-SEQUENCE:2
-UID:foobar
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $old = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-ATTENDEE:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-ATTENDEE:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-ATTENDEE;PARTSTAT=ACCEPTED:mailto:crasher@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $result = $this->process($itip, $old, $expected);
-
- }
-
- function testReplyNewException() {
-
- // This is a reply to 1 instance of a recurring event. This should
- // automatically create an exception.
- $itip = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:REPLY
-BEGIN:VEVENT
-ATTENDEE;PARTSTAT=ACCEPTED:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-SEQUENCE:2
-RECURRENCE-ID:20140725T000000Z
-UID:foobar
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $old = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-RRULE:FREQ=DAILY
-DTSTART:20140724T000000Z
-DTEND:20140724T010000Z
-ATTENDEE:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-RRULE:FREQ=DAILY
-DTSTART:20140724T000000Z
-DTEND:20140724T010000Z
-ATTENDEE:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-END:VEVENT
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-DTSTART:20140725T000000Z
-DTEND:20140725T010000Z
-ATTENDEE;PARTSTAT=ACCEPTED:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-RECURRENCE-ID:20140725T000000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $result = $this->process($itip, $old, $expected);
-
- }
-
- function testReplyNewExceptionTz() {
-
- // This is a reply to 1 instance of a recurring event. This should
- // automatically create an exception.
- $itip = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:REPLY
-BEGIN:VEVENT
-ATTENDEE;PARTSTAT=ACCEPTED:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-SEQUENCE:2
-RECURRENCE-ID;TZID=America/Toronto:20140725T000000
-UID:foobar
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $old = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-RRULE:FREQ=DAILY
-DTSTART;TZID=America/Toronto:20140724T000000
-DTEND;TZID=America/Toronto:20140724T010000
-ATTENDEE:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-RRULE:FREQ=DAILY
-DTSTART;TZID=America/Toronto:20140724T000000
-DTEND;TZID=America/Toronto:20140724T010000
-ATTENDEE:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-END:VEVENT
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-DTSTART;TZID=America/Toronto:20140725T000000
-DTEND;TZID=America/Toronto:20140725T010000
-ATTENDEE;PARTSTAT=ACCEPTED:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-RECURRENCE-ID;TZID=America/Toronto:20140725T000000
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $result = $this->process($itip, $old, $expected);
-
- }
-
- function testReplyPartyCrashCreateExcepton() {
-
- // IN this test there's a recurring event that has an exception. The
- // exception is missing the attendee.
- //
- // The attendee party crashes the instance, so it should show up in the
- // resulting object.
- $itip = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:REPLY
-BEGIN:VEVENT
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Crasher!:mailto:crasher@example.org
-ORGANIZER:mailto:bar@example.org
-SEQUENCE:2
-RECURRENCE-ID:20140725T000000Z
-UID:foobar
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $old = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-RRULE:FREQ=DAILY
-DTSTART:20140724T000000Z
-DTEND:20140724T010000Z
-ORGANIZER:mailto:bar@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-RRULE:FREQ=DAILY
-DTSTART:20140724T000000Z
-DTEND:20140724T010000Z
-ORGANIZER:mailto:bar@example.org
-END:VEVENT
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-DTSTART:20140725T000000Z
-DTEND:20140725T010000Z
-ORGANIZER:mailto:bar@example.org
-RECURRENCE-ID:20140725T000000Z
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Crasher!:mailto:crasher@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $result = $this->process($itip, $old, $expected);
-
- }
-
- function testReplyNewExceptionNoMasterEvent() {
-
- /**
- * This iTip message would normally create a new exception, but the
- * server is not able to create this new instance, because there's no
- * master event to clone from.
- *
- * This test checks if the message is ignored.
- */
- $itip = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:REPLY
-BEGIN:VEVENT
-ATTENDEE;PARTSTAT=ACCEPTED;CN=Crasher!:mailto:crasher@example.org
-ORGANIZER:mailto:bar@example.org
-SEQUENCE:2
-RECURRENCE-ID:20140725T000000Z
-UID:foobar
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $old = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-RRULE:FREQ=DAILY
-DTSTART:20140724T000000Z
-DTEND:20140724T010000Z
-RECURRENCE-ID:20140724T000000Z
-ORGANIZER:mailto:bar@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $expected = null;
- $result = $this->process($itip, $old, $expected);
-
- }
-
- /**
- * @depends testReplyAccept
- */
- function testReplyAcceptUpdateRSVP() {
-
- $itip = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:REPLY
-BEGIN:VEVENT
-ATTENDEE;PARTSTAT=ACCEPTED:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-SEQUENCE:2
-UID:foobar
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $old = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-ATTENDEE;RSVP=TRUE:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-ATTENDEE;PARTSTAT=ACCEPTED;SCHEDULE-STATUS=2.0:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $result = $this->process($itip, $old, $expected);
-
- }
-
- function testReplyNewExceptionFirstOccurence() {
-
- // This is a reply to 1 instance of a recurring event. This should
- // automatically create an exception.
- $itip = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-METHOD:REPLY
-BEGIN:VEVENT
-ATTENDEE;PARTSTAT=ACCEPTED:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-SEQUENCE:2
-RECURRENCE-ID:20140724T000000Z
-UID:foobar
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $old = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-RRULE:FREQ=DAILY
-DTSTART:20140724T000000Z
-DTEND:20140724T010000Z
-ATTENDEE:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $expected = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-RRULE:FREQ=DAILY
-DTSTART:20140724T000000Z
-DTEND:20140724T010000Z
-ATTENDEE:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-END:VEVENT
-BEGIN:VEVENT
-SEQUENCE:2
-UID:foobar
-DTSTART:20140724T000000Z
-DTEND:20140724T010000Z
-ATTENDEE;PARTSTAT=ACCEPTED:mailto:foo@example.org
-ORGANIZER:mailto:bar@example.org
-RECURRENCE-ID:20140724T000000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $result = $this->process($itip, $old, $expected);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerTester.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerTester.php
deleted file mode 100644
index 6dbb517496e..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerTester.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-namespace Sabre\VObject\ITip;
-
-use Sabre\VObject\Reader;
-
-/**
- * Utilities for testing the broker
- *
- * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-abstract class BrokerTester extends \PHPUnit_Framework_TestCase {
-
- use \Sabre\VObject\PHPUnitAssertions;
-
- function parse($oldMessage, $newMessage, $expected = [], $currentUser = 'mailto:one@example.org') {
-
- $broker = new Broker();
- $result = $broker->parseEvent($newMessage, $currentUser, $oldMessage);
-
- $this->assertEquals(count($expected), count($result));
-
- foreach ($expected as $index => $ex) {
-
- $message = $result[$index];
-
- foreach ($ex as $key => $val) {
-
- if ($key === 'message') {
- $this->assertVObjectEqualsVObject(
- $val,
- $message->message->serialize()
- );
- } else {
- $this->assertEquals($val, $message->$key);
- }
-
- }
-
- }
-
- }
-
- function process($input, $existingObject = null, $expected = false) {
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $vcal = Reader::read($input);
-
- foreach ($vcal->getComponents() as $mainComponent) {
- break;
- }
-
- $message = new Message();
- $message->message = $vcal;
- $message->method = isset($vcal->METHOD) ? $vcal->METHOD->getValue() : null;
- $message->component = $mainComponent->name;
- $message->uid = $mainComponent->UID->getValue();
- $message->sequence = isset($vcal->VEVENT[0]) ? (string)$vcal->VEVENT[0]->SEQUENCE : null;
-
- if ($message->method === 'REPLY') {
-
- $message->sender = $mainComponent->ATTENDEE->getValue();
- $message->senderName = isset($mainComponent->ATTENDEE['CN']) ? $mainComponent->ATTENDEE['CN']->getValue() : null;
- $message->recipient = $mainComponent->ORGANIZER->getValue();
- $message->recipientName = isset($mainComponent->ORGANIZER['CN']) ? $mainComponent->ORGANIZER['CN'] : null;
-
- }
-
- $broker = new Broker();
-
- if (is_string($existingObject)) {
- $existingObject = str_replace(
- '%foo%',
- "VERSION:2.0\nPRODID:-//Sabre//Sabre VObject $version//EN\nCALSCALE:GREGORIAN",
- $existingObject
- );
- $existingObject = Reader::read($existingObject);
- }
-
- $result = $broker->processMessage($message, $existingObject);
-
- if (is_null($expected)) {
- $this->assertTrue(!$result);
- return;
- }
-
- $this->assertVObjectEqualsVObject(
- $expected,
- $result
- );
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerTimezoneInParseEventInfoWithoutMasterTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerTimezoneInParseEventInfoWithoutMasterTest.php
deleted file mode 100644
index 255a84e8c1e..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerTimezoneInParseEventInfoWithoutMasterTest.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-namespace Sabre\VObject\ITip;
-
-use Sabre\VObject\Reader;
-
-class BrokerTimezoneInParseEventInfoWithoutMasterTest extends \PHPUnit_Framework_TestCase {
-
- function testTimezoneInParseEventInfoWithoutMaster()
- {
- $calendar = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//Mac OS X 10.9.5//EN
-CALSCALE:GREGORIAN
-BEGIN:VTIMEZONE
-TZID:Europe/Minsk
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0200
-RRULE:FREQ=YEARLY;UNTIL=20100328T000000Z;BYMONTH=3;BYDAY=-1SU
-DTSTART:19930328T020000
-TZNAME:GMT+3
-TZOFFSETTO:+0300
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-DTSTART:20110327T020000
-TZNAME:GMT+3
-TZOFFSETTO:+0300
-RDATE:20110327T020000
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-CREATED:20160331T163031Z
-UID:B9301437-417C-4136-8DB3-8D1555863791
-DTEND;TZID=Europe/Minsk:20160405T100000
-TRANSP:OPAQUE
-ATTENDEE;CN=User Invitee;CUTYPE=INDIVIDUAL;EMAIL=invitee@test.com;PARTSTAT=
- ACCEPTED;ROLE=REQ-PARTICIPANT:mailto:invitee@test.com
-ATTENDEE;CN=User Organizer;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:organ
- izer@test.com
-SUMMARY:Event title
-DTSTART;TZID=Europe/Minsk:20160405T090000
-DTSTAMP:20160331T164108Z
-ORGANIZER;CN=User Organizer:mailto:organizer@test.com
-SEQUENCE:6
-RECURRENCE-ID;TZID=Europe/Minsk:20160405T090000
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20160331T163031Z
-UID:B9301437-417C-4136-8DB3-8D1555863791
-DTEND;TZID=Europe/Minsk:20160406T100000
-TRANSP:OPAQUE
-ATTENDEE;CN=User Invitee;CUTYPE=INDIVIDUAL;EMAIL=invitee@test.com;PARTSTAT=
- ACCEPTED;ROLE=REQ-PARTICIPANT:mailto:invitee@test.com
-ATTENDEE;CN=User Organizer;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:organ
- izer@test.com
-SUMMARY:Event title
-DTSTART;TZID=Europe/Minsk:20160406T090000
-DTSTAMP:20160331T165845Z
-ORGANIZER;CN=User Organizer:mailto:organizer@test.com
-SEQUENCE:6
-RECURRENCE-ID;TZID=Europe/Minsk:20160406T090000
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $calendar = Reader::read($calendar);
- $broker = new Broker();
-
- $reflectionMethod = new \ReflectionMethod($broker, 'parseEventInfo');
- $reflectionMethod->setAccessible(true);
- $data = $reflectionMethod->invoke($broker, $calendar);
- $this->assertInstanceOf('DateTimeZone', $data['timezone']);
- $this->assertEquals($data['timezone']->getName(), 'Europe/Minsk');
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerUpdateEventTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerUpdateEventTest.php
deleted file mode 100644
index bc109009e70..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/BrokerUpdateEventTest.php
+++ /dev/null
@@ -1,846 +0,0 @@
-<?php
-
-namespace Sabre\VObject\ITip;
-
-class BrokerUpdateEventTest extends BrokerTester {
-
- function testInviteChange() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-SUMMARY:foo
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Strunk;PARTSTAT=ACCEPTED:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:2
-SUMMARY:foo
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Strunk;PARTSTAT=ACCEPTED:mailto:strunk@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-ATTENDEE;CN=Three:mailto:three@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'CANCEL',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one@example.org',
- 'recipientName' => 'One',
- 'significantChange' => true,
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:CANCEL
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:2
-SUMMARY:foo
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- [
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:two@example.org',
- 'recipientName' => 'Two',
- 'significantChange' => false,
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REQUEST
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:2
-SUMMARY:foo
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Strunk;PARTSTAT=ACCEPTED:mailto:strunk@example.org
-ATTENDEE;CN=Two;PARTSTAT=NEEDS-ACTION:mailto:two@example.org
-ATTENDEE;CN=Three;PARTSTAT=NEEDS-ACTION:mailto:three@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- [
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:three@example.org',
- 'recipientName' => 'Three',
- 'significantChange' => true,
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REQUEST
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:2
-SUMMARY:foo
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Strunk;PARTSTAT=ACCEPTED:mailto:strunk@example.org
-ATTENDEE;CN=Two;PARTSTAT=NEEDS-ACTION:mailto:two@example.org
-ATTENDEE;CN=Three;PARTSTAT=NEEDS-ACTION:mailto:three@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- ];
-
- $this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk@example.org');
-
- }
-
- function testInviteChangeFromNonSchedulingToSchedulingObject() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:2
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one@example.org',
- 'recipientName' => 'One',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REQUEST
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:2
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One;PARTSTAT=NEEDS-ACTION:mailto:one@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
-
- ];
-
- $this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk@example.org');
-
- }
-
- function testInviteChangeFromSchedulingToNonSchedulingObject() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:2
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'CANCEL',
- 'component' => 'VEVENT',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:CANCEL
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:1
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
-
- ];
-
- $this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk@example.org');
-
- }
-
- function testNoAttendees() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:2
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [];
- $this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk@example.org');
-
- }
-
- function testRemoveInstance() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-DTSTART;TZID=America/Toronto:20140716T120000
-DTEND;TZID=America/Toronto:20140716T130000
-RRULE:FREQ=WEEKLY
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:2
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-DTSTART;TZID=America/Toronto:20140716T120000
-DTEND;TZID=America/Toronto:20140716T130000
-RRULE:FREQ=WEEKLY
-EXDATE;TZID=America/Toronto:20140724T120000
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one@example.org',
- 'recipientName' => 'One',
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REQUEST
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:2
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One;PARTSTAT=NEEDS-ACTION:mailto:one@example.org
-DTSTART;TZID=America/Toronto:20140716T120000
-DTEND;TZID=America/Toronto:20140716T130000
-RRULE:FREQ=WEEKLY
-EXDATE;TZID=America/Toronto:20140724T120000
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- ];
-
- $this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk@example.org');
-
- }
-
- /**
- * This test is identical to the first test, except this time we change the
- * DURATION property.
- *
- * This should ensure that the message is significant for every attendee,
- */
- function testInviteChangeSignificantChange() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-DURATION:PT1H
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Strunk;PARTSTAT=ACCEPTED:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-DURATION:PT2H
-SEQUENCE:2
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Strunk;PARTSTAT=ACCEPTED:mailto:strunk@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-ATTENDEE;CN=Three:mailto:three@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'CANCEL',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one@example.org',
- 'recipientName' => 'One',
- 'significantChange' => true,
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:CANCEL
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:2
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- [
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:two@example.org',
- 'recipientName' => 'Two',
- 'significantChange' => true,
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REQUEST
-BEGIN:VEVENT
-UID:foobar
-DURATION:PT2H
-SEQUENCE:2
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Strunk;PARTSTAT=ACCEPTED:mailto:strunk@example.org
-ATTENDEE;CN=Two;PARTSTAT=NEEDS-ACTION:mailto:two@example.org
-ATTENDEE;CN=Three;PARTSTAT=NEEDS-ACTION:mailto:three@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- [
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:three@example.org',
- 'recipientName' => 'Three',
- 'significantChange' => true,
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REQUEST
-BEGIN:VEVENT
-UID:foobar
-DURATION:PT2H
-SEQUENCE:2
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Strunk;PARTSTAT=ACCEPTED:mailto:strunk@example.org
-ATTENDEE;CN=Two;PARTSTAT=NEEDS-ACTION:mailto:two@example.org
-ATTENDEE;CN=Three;PARTSTAT=NEEDS-ACTION:mailto:three@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- ];
-
- $this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk@example.org');
-
- }
-
- function testInviteNoChange() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Strunk;PARTSTAT=ACCEPTED:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:2
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Strunk;PARTSTAT=ACCEPTED:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one@example.org',
- 'recipientName' => 'One',
- 'significantChange' => false,
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REQUEST
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:2
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Strunk;PARTSTAT=ACCEPTED:mailto:strunk@example.org
-ATTENDEE;CN=One;PARTSTAT=NEEDS-ACTION:mailto:one@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
-
- ];
-
- $this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk@example.org');
-
- }
-
- function testInviteNoChangeForceSend() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Strunk;PARTSTAT=ACCEPTED:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:2
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Strunk;PARTSTAT=ACCEPTED:mailto:strunk@example.org
-ATTENDEE;SCHEDULE-FORCE-SEND=REQUEST;CN=One:mailto:one@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one@example.org',
- 'recipientName' => 'One',
- 'significantChange' => true,
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REQUEST
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:2
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Strunk;PARTSTAT=ACCEPTED:mailto:strunk@example.org
-ATTENDEE;CN=One;PARTSTAT=NEEDS-ACTION:mailto:one@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
-
- ];
-
- $this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk@example.org');
-
- }
-
- function testInviteRemoveAttendees() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-SUMMARY:foo
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:2
-SUMMARY:foo
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'CANCEL',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one@example.org',
- 'recipientName' => 'One',
- 'significantChange' => true,
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:CANCEL
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:2
-SUMMARY:foo
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=One:mailto:one@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- [
- 'uid' => 'foobar',
- 'method' => 'CANCEL',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:two@example.org',
- 'recipientName' => 'Two',
- 'significantChange' => true,
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:CANCEL
-BEGIN:VEVENT
-UID:foobar
-DTSTAMP:**ANY**
-SEQUENCE:2
-SUMMARY:foo
-DTSTART:20140716T120000Z
-DTEND:20140716T130000Z
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Two:mailto:two@example.org
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- ];
-
- $result = $this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk@example.org');
-
- }
-
- function testInviteChangeExdateOrder() {
-
- $oldMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//Mac OS X 10.10.1//EN
-CALSCALE:GREGORIAN
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:0
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Strunk;CUTYPE=INDIVIDUAL;EMAIL=strunk@example.org;PARTSTAT=ACCE
- PTED:mailto:strunk@example.org
-ATTENDEE;CN=One;CUTYPE=INDIVIDUAL;EMAIL=one@example.org;PARTSTAT=ACCEPTED;R
- OLE=REQ-PARTICIPANT;SCHEDULE-STATUS="1.2;Message delivered locally":mailto
- :one@example.org
-SUMMARY:foo
-DTSTART:20141211T160000Z
-DTEND:20141211T170000Z
-RRULE:FREQ=WEEKLY
-EXDATE:20141225T160000Z,20150101T160000Z
-EXDATE:20150108T160000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
-
- $newMessage = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//Mac OS X 10.10.1//EN
-CALSCALE:GREGORIAN
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Strunk;CUTYPE=INDIVIDUAL;EMAIL=strunk@example.org;PARTSTAT=ACCE
- PTED:mailto:strunk@example.org
-ATTENDEE;CN=One;CUTYPE=INDIVIDUAL;EMAIL=one@example.org;PARTSTAT=ACCEPTED;R
- OLE=REQ-PARTICIPANT;SCHEDULE-STATUS=1.2:mailto:one@example.org
-DTSTART:20141211T160000Z
-DTEND:20141211T170000Z
-RRULE:FREQ=WEEKLY
-EXDATE:20150101T160000Z
-EXDATE:20150108T160000Z,20141225T160000Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
-
- $expected = [
- [
- 'uid' => 'foobar',
- 'method' => 'REQUEST',
- 'component' => 'VEVENT',
- 'sender' => 'mailto:strunk@example.org',
- 'senderName' => 'Strunk',
- 'recipient' => 'mailto:one@example.org',
- 'recipientName' => 'One',
- 'significantChange' => false,
- 'message' => <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REQUEST
-BEGIN:VEVENT
-UID:foobar
-SEQUENCE:1
-ORGANIZER;CN=Strunk:mailto:strunk@example.org
-ATTENDEE;CN=Strunk;CUTYPE=INDIVIDUAL;EMAIL=strunk@example.org;PARTSTAT=ACCE
- PTED:mailto:strunk@example.org
-ATTENDEE;CN=One;CUTYPE=INDIVIDUAL;EMAIL=one@example.org;PARTSTAT=ACCEPTED;R
- OLE=REQ-PARTICIPANT:mailto:one@example.org
-DTSTART:20141211T160000Z
-DTEND:20141211T170000Z
-RRULE:FREQ=WEEKLY
-EXDATE:20150101T160000Z
-EXDATE:20150108T160000Z,20141225T160000Z
-END:VEVENT
-END:VCALENDAR
-ICS
-
- ],
- ];
-
- $this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk@example.org');
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/EvolutionTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/EvolutionTest.php
deleted file mode 100644
index 3afe560d508..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/EvolutionTest.php
+++ /dev/null
@@ -1,2653 +0,0 @@
-<?php
-
-namespace Sabre\VObject\ITip;
-
-class EvolutionTest extends BrokerTester {
-
- /**
- * Evolution does things as usual a little bit differently.
- *
- * We're adding a seprate test just for it.
- */
- function testNewEvolutionEvent() {
-
- $ics = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-CALSCALE:GREGORIAN
-PRODID:-//Ximian//NONSGML Evolution Calendar//EN
-BEGIN:VTIMEZONE
-TZID:/freeassociation.sourceforge.net/Tzfile/America/Toronto
-X-LIC-LOCATION:America/Toronto
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19691026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19700426T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19701025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19710425T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19711031T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19720430T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19721029T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19730429T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19731028T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19740428T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19741027T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19750427T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19751026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19760425T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19761031T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19770424T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19771030T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19780430T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19781029T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19790429T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19791028T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19800427T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19801026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19810426T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19811025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19820425T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19821031T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19830424T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19831030T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19840429T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19841028T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19850428T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19851027T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19860427T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19861026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19870405T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19871025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19880403T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19881030T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19890402T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19891029T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19900401T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19901028T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19910407T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19911027T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19920405T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19921025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19930404T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19931031T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19940403T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19941030T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19950402T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19951029T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19960407T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19961027T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19970406T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19971026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19980405T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19981025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19990404T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19991031T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20000402T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20001029T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20010401T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20011028T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20020407T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20021027T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20030406T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20031026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20040404T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20041031T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20050403T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20051030T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20060402T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20061029T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20070311T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20071104T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20080309T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20081102T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20090308T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20091101T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20100314T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20101107T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20110313T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20111106T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20120311T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20121104T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20130310T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20131103T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20140309T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20141102T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20150308T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20151101T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20160313T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20161106T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20170312T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20171105T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20180311T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20181104T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20190310T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20191103T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20200308T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20201101T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20210314T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20211107T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20220313T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20221106T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20230312T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20231105T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20240310T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20241103T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20250309T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20251102T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20260308T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20261101T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20270314T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20271107T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20280312T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20281105T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20290311T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20291104T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20300310T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20301103T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20310309T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20311102T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20320314T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20321107T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20330313T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20331106T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20340312T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20341105T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20350311T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20351104T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20360309T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20361102T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20370308T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20371101T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:20140813T153116Z-12176-1000-1065-6@johnny-lubuntu
-DTSTAMP:20140813T142829Z
-DTSTART;TZID=/freeassociation.sourceforge.net/Tzfile/America/Toronto:201408
- 15T110000
-DTEND;TZID=/freeassociation.sourceforge.net/Tzfile/America/Toronto:20140815
- T113000
-TRANSP:OPAQUE
-SEQUENCE:2
-SUMMARY:Evo makes a Meeting (fruux HQ) (fruux HQ)
-LOCATION:fruux HQ
-CLASS:PUBLIC
-ORGANIZER;SENT-BY="MAILTO:martin+johnny@fruux.com":MAILTO:martin@fruux.com
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;RSVP=TRUE
- ;SENT-BY="MAILTO:martin+johnny@fruux.com";LANGUAGE=en:MAILTO:martin@fruux.
- com
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=
- TRUE;LANGUAGE=en:MAILTO:dominik@fruux.com
-CREATED:20140813T153211Z
-LAST-MODIFIED:20140813T155353Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $version = \Sabre\VObject\Version::VERSION;
- $expectedICS = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-METHOD:REQUEST
-BEGIN:VTIMEZONE
-TZID:/freeassociation.sourceforge.net/Tzfile/America/Toronto
-X-LIC-LOCATION:America/Toronto
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19691026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19700426T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19701025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19710425T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19711031T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19720430T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19721029T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19730429T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19731028T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19740428T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19741027T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19750427T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19751026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19760425T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19761031T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19770424T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19771030T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19780430T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19781029T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19790429T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19791028T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19800427T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19801026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19810426T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19811025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19820425T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19821031T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19830424T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19831030T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19840429T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19841028T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19850428T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19851027T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19860427T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19861026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19870405T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19871025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19880403T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19881030T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19890402T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19891029T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19900401T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19901028T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19910407T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19911027T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19920405T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19921025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19930404T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19931031T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19940403T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19941030T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19950402T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19951029T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19960407T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19961027T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19970406T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19971026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19980405T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19981025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19990404T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19991031T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20000402T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20001029T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20010401T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20011028T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20020407T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20021027T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20030406T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20031026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20040404T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20041031T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20050403T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20051030T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20060402T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20061029T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20070311T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20071104T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20080309T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20081102T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20090308T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20091101T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20100314T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20101107T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20110313T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20111106T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20120311T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20121104T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20130310T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20131103T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20140309T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20141102T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20150308T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20151101T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20160313T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20161106T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20170312T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20171105T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20180311T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20181104T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20190310T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20191103T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20200308T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20201101T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20210314T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20211107T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20220313T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20221106T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20230312T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20231105T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20240310T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20241103T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20250309T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20251102T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20260308T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20261101T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20270314T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20271107T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20280312T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20281105T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20290311T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20291104T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20300310T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20301103T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20310309T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20311102T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20320314T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20321107T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20330313T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20331106T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20340312T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20341105T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20350311T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20351104T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20360309T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20361102T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20370308T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20371101T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:20140813T153116Z-12176-1000-1065-6@johnny-lubuntu
-DTSTAMP:20140813T142829Z
-DTSTART;TZID=/freeassociation.sourceforge.net/Tzfile/America/Toronto:201408
- 15T110000
-DTEND;TZID=/freeassociation.sourceforge.net/Tzfile/America/Toronto:20140815
- T113000
-TRANSP:OPAQUE
-SEQUENCE:2
-SUMMARY:Evo makes a Meeting (fruux HQ) (fruux HQ)
-LOCATION:fruux HQ
-CLASS:PUBLIC
-ORGANIZER;SENT-BY="MAILTO:martin+johnny@fruux.com":MAILTO:martin@fruux.com
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;RSVP=TRUE
- ;SENT-BY="MAILTO:martin+johnny@fruux.com";LANGUAGE=en:MAILTO:martin@fruux.
- com
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=
- TRUE;LANGUAGE=en:MAILTO:dominik@fruux.com
-CREATED:20140813T153211Z
-LAST-MODIFIED:20140813T155353Z
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $expected = [
- [
- 'uid' => '20140813T153116Z-12176-1000-1065-6@johnny-lubuntu',
- 'method' => 'REQUEST',
- 'sender' => 'mailto:martin@fruux.com',
- 'senderName' => null,
- 'recipient' => 'mailto:dominik@fruux.com',
- 'recipientName' => null,
- 'message' => $expectedICS,
- ]
- ];
- $this->parse(null, $ics, $expected, 'mailto:martin@fruux.com');
-
- }
-
- /**
- * This is an event originally from evolution, then parsed by sabredav and
- * again mangled by iCal. This triggered a few bugs related to email
- * address scheme casing.
- */
- function testAttendeeModify() {
-
- $old = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject 3.3.1//EN
-CALSCALE:GREGORIAN
-BEGIN:VTIMEZONE
-TZID:/freeassociation.sourceforge.net/Tzfile/America/Toronto
-X-LIC-LOCATION:America/Toronto
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19691026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19700426T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19701025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19710425T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19711031T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19720430T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19721029T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19730429T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19731028T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19740428T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19741027T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19750427T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19751026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19760425T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19761031T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19770424T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19771030T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19780430T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19781029T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19790429T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19791028T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19800427T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19801026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19810426T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19811025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19820425T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19821031T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19830424T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19831030T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19840429T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19841028T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19850428T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19851027T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19860427T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19861026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19870405T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19871025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19880403T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19881030T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19890402T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19891029T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19900401T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19901028T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19910407T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19911027T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19920405T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19921025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19930404T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19931031T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19940403T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19941030T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19950402T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19951029T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19960407T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19961027T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19970406T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19971026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19980405T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19981025T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:19990404T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:19991031T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20000402T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20001029T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20010401T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20011028T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20020407T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20021027T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20030406T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20031026T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20040404T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20041031T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20050403T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20051030T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20060402T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20061029T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20070311T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20071104T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20080309T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20081102T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20090308T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20091101T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20100314T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20101107T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20110313T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20111106T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20120311T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20121104T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20130310T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20131103T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20140309T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20141102T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20150308T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20151101T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20160313T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20161106T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20170312T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20171105T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20180311T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20181104T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20190310T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20191103T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20200308T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20201101T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20210314T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20211107T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20220313T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20221106T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20230312T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20231105T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20240310T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20241103T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20250309T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20251102T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20260308T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20261101T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20270314T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20271107T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20280312T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20281105T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20290311T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20291104T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20300310T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20301103T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20310309T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20311102T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20320314T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20321107T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20330313T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20331106T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20340312T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20341105T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20350311T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20351104T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20360309T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20361102T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-BEGIN:DAYLIGHT
-TZNAME:EDT
-DTSTART:20370308T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZNAME:EST
-DTSTART:20371101T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:20140813T212317Z-6646-1000-1221-23@evert-ubuntu
-DTSTAMP:20140813T212221Z
-DTSTART;TZID=/freeassociation.sourceforge.net/Tzfile/America/Toronto:201408
- 13T180000
-DTEND;TZID=/freeassociation.sourceforge.net/Tzfile/America/Toronto:20140813
- T200000
-TRANSP:OPAQUE
-SEQUENCE:4
-SUMMARY:Testing evolution
-LOCATION:Online
-CLASS:PUBLIC
-ORGANIZER:MAILTO:o@example.org
-CREATED:20140813T212510Z
-LAST-MODIFIED:20140813T212541Z
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;RSVP=TRUE;LANGUAGE=en:MAILTO:o@example.org
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;LANGUAGE=en:MAILTO:a1@example.org
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;LANGUAGE=en:MAILTO:a2@example.org
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RSVP=TRUE;LANGUAGE=en:MAILTO:a3@example.org
-STATUS:CANCELLED
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $new = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//Mac OS X 10.9.4//EN
-CALSCALE:GREGORIAN
-BEGIN:VTIMEZONE
-TZID:America/Toronto
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-DTSTART:20070311T020000
-TZNAME:EDT
-TZOFFSETTO:-0400
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-DTSTART:20071104T020000
-TZNAME:EST
-TZOFFSETTO:-0500
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-TRANSP:OPAQUE
-DTEND;TZID=America/Toronto:20140813T200000
-ORGANIZER:MAILTO:o@example.org
-UID:20140813T212317Z-6646-1000-1221-23@evert-ubuntu
-DTSTAMP:20140813T212221Z
-LOCATION:Online
-STATUS:CANCELLED
-SEQUENCE:4
-CLASS:PUBLIC
-SUMMARY:Testing evolution
-LAST-MODIFIED:20140813T212541Z
-DTSTART;TZID=America/Toronto:20140813T180000
-CREATED:20140813T212510Z
-ATTENDEE;CUTYPE=INDIVIDUAL;LANGUAGE=en;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:MAILTO:a2@example.org
-ATTENDEE;CUTYPE=INDIVIDUAL;LANGUAGE=en;PARTSTAT=ACCEPTED;ROLE=REQ-PARTICIPANT;RSVP=TRUE:MAILTO:o@example.org
-ATTENDEE;CUTYPE=INDIVIDUAL;LANGUAGE=en;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:MAILTO:a1@example.org
-ATTENDEE;CUTYPE=INDIVIDUAL;LANGUAGE=en;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:MAILTO:a3@example.org
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $this->parse($old, $new, [], 'mailto:a1@example.org');
-
-
- }
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/MessageTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/MessageTest.php
deleted file mode 100644
index 0fed7eb4a76..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ITip/MessageTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Sabre\VObject\ITip;
-
-class MessageTest extends \PHPUnit_Framework_TestCase {
-
- function testNoScheduleStatus() {
-
- $message = new Message();
- $this->assertFalse($message->getScheduleStatus());
-
- }
-
- function testScheduleStatus() {
-
- $message = new Message();
- $message->scheduleStatus = '1.2;Delivered';
-
- $this->assertEquals('1.2', $message->getScheduleStatus());
-
- }
-
- function testUnexpectedScheduleStatus() {
-
- $message = new Message();
- $message->scheduleStatus = '9.9.9';
-
- $this->assertEquals('9.9.9', $message->getScheduleStatus());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Issue153Test.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Issue153Test.php
deleted file mode 100644
index fca07fe9f39..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Issue153Test.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class Issue153Test extends \PHPUnit_Framework_TestCase {
-
- function testRead() {
-
- $obj = Reader::read(file_get_contents(dirname(__FILE__) . '/issue153.vcf'));
- $this->assertEquals('Test Benutzer', (string)$obj->FN);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Issue259Test.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Issue259Test.php
deleted file mode 100644
index 4a73be560c2..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Issue259Test.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class Issue259Test extends \PHPUnit_Framework_TestCase {
-
- function testParsingJcalWithUntil() {
- $jcalWithUntil = '["vcalendar",[],[["vevent",[["uid",{},"text","dd1f7d29"],["organizer",{"cn":"robert"},"cal-address","mailto:robert@robert.com"],["dtstart",{"tzid":"Europe/Berlin"},"date-time","2015-10-21T12:00:00"],["dtend",{"tzid":"Europe/Berlin"},"date-time","2015-10-21T13:00:00"],["transp",{},"text","OPAQUE"],["rrule",{},"recur",{"freq":"MONTHLY","until":"2016-01-01T22:00:00Z"}]],[]]]]';
- $parser = new Parser\Json();
- $parser->setInput($jcalWithUntil);
-
- $vcalendar = $parser->parse();
- $eventAsArray = $vcalendar->select('VEVENT');
- $event = reset($eventAsArray);
- $rruleAsArray = $event->select('RRULE');
- $rrule = reset($rruleAsArray);
- $this->assertNotNull($rrule);
- $this->assertEquals($rrule->getValue(), 'FREQ=MONTHLY;UNTIL=20160101T220000Z');
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Issue36WorkAroundTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Issue36WorkAroundTest.php
deleted file mode 100644
index e2b9caf1d9f..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Issue36WorkAroundTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class Issue36WorkAroundTest extends \PHPUnit_Framework_TestCase {
-
- function testWorkaround() {
-
- // See https://github.com/fruux/sabre-vobject/issues/36
- $event = <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-BEGIN:VEVENT
-SUMMARY:Titel
-SEQUENCE:1
-TRANSP:TRANSPARENT
-RRULE:FREQ=YEARLY
-LAST-MODIFIED:20130323T225737Z
-DTSTAMP:20130323T225737Z
-UID:1833bd44-188b-405c-9f85-1a12105318aa
-CATEGORIES:Jubiläum
-X-MOZ-GENERATION:3
-RECURRENCE-ID;RANGE=THISANDFUTURE;VALUE=DATE:20131013
-DTSTART;VALUE=DATE:20131013
-CREATED:20100721T121914Z
-DURATION:P1D
-END:VEVENT
-END:VCALENDAR
-ICS;
-
- $obj = Reader::read($event);
-
- // If this does not throw an exception, it's all good.
- $it = new Recur\EventIterator($obj, '1833bd44-188b-405c-9f85-1a12105318aa');
- $this->assertInstanceOf('Sabre\\VObject\\Recur\\EventIterator', $it);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Issue40Test.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Issue40Test.php
deleted file mode 100644
index 401cc19a05a..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Issue40Test.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-/**
- * This test is created to handle the issues brought forward by issue 40.
- *
- * https://github.com/fruux/sabre-vobject/issues/40
- */
-class Issue40Test extends \PHPUnit_Framework_TestCase {
-
- function testEncode() {
-
- $card = new Component\VCard();
- $card->add('N', ['van der Harten', ['Rene', 'J.'], "", 'Sir', 'R.D.O.N.'], ['SORT-AS' => ['Harten', 'Rene']]);
-
- unset($card->UID);
-
- $expected = implode("\r\n", [
- "BEGIN:VCARD",
- "VERSION:4.0",
- "PRODID:-//Sabre//Sabre VObject " . Version::VERSION . '//EN',
- "N;SORT-AS=Harten,Rene:van der Harten;Rene,J.;;Sir;R.D.O.N.",
- "END:VCARD",
- ""
- ]);
-
- $this->assertEquals($expected, $card->serialize());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Issue64Test.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Issue64Test.php
deleted file mode 100644
index 986a2481361..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Issue64Test.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class Issue64Test extends \PHPUnit_Framework_TestCase {
-
- function testRead() {
-
- $vcard = Reader::read(file_get_contents(dirname(__FILE__) . '/issue64.vcf'));
- $vcard = $vcard->convert(\Sabre\VObject\Document::VCARD30);
- $vcard = $vcard->serialize();
-
- $converted = Reader::read($vcard);
-
- $this->assertInstanceOf('Sabre\\VObject\\Component\\VCard', $converted);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Issue96Test.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Issue96Test.php
deleted file mode 100644
index f0ed54804f1..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Issue96Test.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class Issue96Test extends \PHPUnit_Framework_TestCase {
-
- function testRead() {
-
- $input = <<<VCF
-BEGIN:VCARD
-VERSION:2.1
-SOURCE:Yahoo Contacts (http://contacts.yahoo.com)
-URL;CHARSET=utf-8;ENCODING=QUOTED-PRINTABLE:=
-http://www.example.org
-END:VCARD
-VCF;
-
- $vcard = Reader::read($input, Reader::OPTION_FORGIVING);
- $this->assertInstanceOf('Sabre\\VObject\\Component\\VCard', $vcard);
- $this->assertEquals("http://www.example.org", $vcard->URL->getValue());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/IssueUndefinedIndexTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/IssueUndefinedIndexTest.php
deleted file mode 100644
index 6f8afe60cd7..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/IssueUndefinedIndexTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class IssueUndefinedIndexTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * @expectedException \Sabre\VObject\ParseException
- */
- function testRead() {
-
- $input = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-PRODID:foo
-N:Holmes;Sherlock;;;
-FN:Sherlock Holmes
-ORG:Acme Inc;
-ADR;type=WORK;type=pref:;;,
-\\n221B,Baker Street;London;;12345;United Kingdom
-UID:foo
-END:VCARD
-VCF;
-
- $vcard = Reader::read($input, Reader::OPTION_FORGIVING);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/JCalTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/JCalTest.php
deleted file mode 100644
index 8c437162dde..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/JCalTest.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class JCalTest extends \PHPUnit_Framework_TestCase {
-
- function testToJCal() {
-
- $cal = new Component\VCalendar();
-
- $event = $cal->add('VEVENT', [
- "UID" => "foo",
- "DTSTART" => new \DateTime("2013-05-26 18:10:00Z"),
- "DURATION" => "P1D",
- "CATEGORIES" => ['home', 'testing'],
- "CREATED" => new \DateTime("2013-05-26 18:10:00Z"),
-
- "ATTENDEE" => "mailto:armin@example.org",
- "GEO" => [51.96668, 7.61876],
- "SEQUENCE" => 5,
- "FREEBUSY" => ["20130526T210213Z/PT1H", "20130626T120000Z/20130626T130000Z"],
- "URL" => "http://example.org/",
- "TZOFFSETFROM" => "+0500",
- "RRULE" => ['FREQ' => 'WEEKLY', 'BYDAY' => ['MO', 'TU']],
- ], false);
-
- // Modifying DTSTART to be a date-only.
- $event->dtstart['VALUE'] = 'DATE';
- $event->add("X-BOOL", true, ['VALUE' => 'BOOLEAN']);
- $event->add("X-TIME", "08:00:00", ['VALUE' => 'TIME']);
- $event->add("ATTACH", "attachment", ['VALUE' => 'BINARY']);
- $event->add("ATTENDEE", "mailto:dominik@example.org", ["CN" => "Dominik", "PARTSTAT" => "DECLINED"]);
-
- $event->add('REQUEST-STATUS', ["2.0", "Success"]);
- $event->add('REQUEST-STATUS', ["3.7", "Invalid Calendar User", "ATTENDEE:mailto:jsmith@example.org"]);
-
- $event->add('DTEND', '20150108T133000');
-
- $expected = [
- "vcalendar",
- [
- [
- "version",
- new \StdClass(),
- "text",
- "2.0"
- ],
- [
- "prodid",
- new \StdClass(),
- "text",
- "-//Sabre//Sabre VObject " . Version::VERSION . "//EN",
- ],
- [
- "calscale",
- new \StdClass(),
- "text",
- "GREGORIAN"
- ],
- ],
- [
- ["vevent",
- [
- [
- "uid", new \StdClass(), "text", "foo",
- ],
- [
- "dtstart", new \StdClass(), "date", "2013-05-26",
- ],
- [
- "duration", new \StdClass(), "duration", "P1D",
- ],
- [
- "categories", new \StdClass(), "text", "home", "testing",
- ],
- [
- "created", new \StdClass(), "date-time", "2013-05-26T18:10:00Z",
- ],
- [
- "attendee", new \StdClass(), "cal-address", "mailto:armin@example.org",
- ],
- [
- "attendee",
- (object)[
- "cn" => "Dominik",
- "partstat" => "DECLINED",
- ],
- "cal-address",
- "mailto:dominik@example.org"
- ],
- [
- "geo", new \StdClass(), "float", [51.96668, 7.61876],
- ],
- [
- "sequence", new \StdClass(), "integer", 5
- ],
- [
- "freebusy", new \StdClass(), "period", ["2013-05-26T21:02:13", "PT1H"], ["2013-06-26T12:00:00", "2013-06-26T13:00:00"],
- ],
- [
- "url", new \StdClass(), "uri", "http://example.org/",
- ],
- [
- "tzoffsetfrom", new \StdClass(), "utc-offset", "+05:00",
- ],
- [
- "rrule", new \StdClass(), "recur", [
- 'freq' => 'WEEKLY',
- 'byday' => ['MO', 'TU'],
- ],
- ],
- [
- "x-bool", new \StdClass(), "boolean", true
- ],
- [
- "x-time", new \StdClass(), "time", "08:00:00",
- ],
- [
- "attach", new \StdClass(), "binary", base64_encode('attachment')
- ],
- [
- "request-status",
- new \StdClass(),
- "text",
- ["2.0", "Success"],
- ],
- [
- "request-status",
- new \StdClass(),
- "text",
- ["3.7", "Invalid Calendar User", "ATTENDEE:mailto:jsmith@example.org"],
- ],
- [
- 'dtend',
- new \StdClass(),
- "date-time",
- "2015-01-08T13:30:00",
- ],
- ],
- [],
- ]
- ],
- ];
-
- $this->assertEquals($expected, $cal->jsonSerialize());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/JCardTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/JCardTest.php
deleted file mode 100644
index 87ff2fff885..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/JCardTest.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class JCardTest extends \PHPUnit_Framework_TestCase {
-
- function testToJCard() {
-
- $card = new Component\VCard([
- "VERSION" => "4.0",
- "UID" => "foo",
- "BDAY" => "19850407",
- "REV" => "19951031T222710Z",
- "LANG" => "nl",
- "N" => ["Last", "First", "Middle", "", ""],
- "item1.TEL" => "+1 555 123456",
- "item1.X-AB-LABEL" => "Walkie Talkie",
- "ADR" => [
- "",
- "",
- ["My Street", "Left Side", "Second Shack"],
- "Hometown",
- "PA",
- "18252",
- "U.S.A",
- ],
- ]);
-
- $card->add('BDAY', '1979-12-25', ['VALUE' => 'DATE', 'X-PARAM' => [1, 2]]);
- $card->add('BDAY', '1979-12-25T02:00:00', ['VALUE' => 'DATE-TIME']);
-
-
- $card->add('X-TRUNCATED', '--1225', ['VALUE' => 'DATE']);
- $card->add('X-TIME-LOCAL', '123000', ['VALUE' => 'TIME']);
- $card->add('X-TIME-UTC', '12:30:00Z', ['VALUE' => 'TIME']);
- $card->add('X-TIME-OFFSET', '12:30:00-08:00', ['VALUE' => 'TIME']);
- $card->add('X-TIME-REDUCED', '23', ['VALUE' => 'TIME']);
- $card->add('X-TIME-TRUNCATED', '--30', ['VALUE' => 'TIME']);
-
- $card->add('X-KARMA-POINTS', '42', ['VALUE' => 'INTEGER']);
- $card->add('X-GRADE', '1.3', ['VALUE' => 'FLOAT']);
-
- $card->add('TZ', '-0500', ['VALUE' => 'UTC-OFFSET']);
-
- $expected = [
- "vcard",
- [
- [
- "version",
- new \StdClass(),
- "text",
- "4.0"
- ],
- [
- "prodid",
- new \StdClass(),
- "text",
- "-//Sabre//Sabre VObject " . Version::VERSION . "//EN",
- ],
- [
- "uid",
- new \StdClass(),
- "text",
- "foo",
- ],
- [
- "bday",
- new \StdClass(),
- "date-and-or-time",
- "1985-04-07",
- ],
- [
- "bday",
- (object)[
- 'x-param' => [1,2],
- ],
- "date",
- "1979-12-25",
- ],
- [
- "bday",
- new \StdClass(),
- "date-time",
- "1979-12-25T02:00:00",
- ],
- [
- "rev",
- new \StdClass(),
- "timestamp",
- "1995-10-31T22:27:10Z",
- ],
- [
- "lang",
- new \StdClass(),
- "language-tag",
- "nl",
- ],
- [
- "n",
- new \StdClass(),
- "text",
- ["Last", "First", "Middle", "", ""],
- ],
- [
- "tel",
- (object)[
- "group" => "item1",
- ],
- "text",
- "+1 555 123456",
- ],
- [
- "x-ab-label",
- (object)[
- "group" => "item1",
- ],
- "unknown",
- "Walkie Talkie",
- ],
- [
- "adr",
- new \StdClass(),
- "text",
- [
- "",
- "",
- ["My Street", "Left Side", "Second Shack"],
- "Hometown",
- "PA",
- "18252",
- "U.S.A",
- ],
- ],
- [
- "x-truncated",
- new \StdClass(),
- "date",
- "--12-25",
- ],
- [
- "x-time-local",
- new \StdClass(),
- "time",
- "12:30:00"
- ],
- [
- "x-time-utc",
- new \StdClass(),
- "time",
- "12:30:00Z"
- ],
- [
- "x-time-offset",
- new \StdClass(),
- "time",
- "12:30:00-08:00"
- ],
- [
- "x-time-reduced",
- new \StdClass(),
- "time",
- "23"
- ],
- [
- "x-time-truncated",
- new \StdClass(),
- "time",
- "--30"
- ],
- [
- "x-karma-points",
- new \StdClass(),
- "integer",
- 42
- ],
- [
- "x-grade",
- new \StdClass(),
- "float",
- 1.3
- ],
- [
- "tz",
- new \StdClass(),
- "utc-offset",
- "-05:00",
- ],
- ],
- ];
-
- $this->assertEquals($expected, $card->jsonSerialize());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/LineFoldingIssueTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/LineFoldingIssueTest.php
deleted file mode 100644
index 47fef1c11e7..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/LineFoldingIssueTest.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class LineFoldingIssueTest extends \PHPUnit_Framework_TestCase {
-
- function testRead() {
-
- $event = <<<ICS
-BEGIN:VCALENDAR\r
-BEGIN:VEVENT\r
-DESCRIPTION:TEST\\n\\n \\n\\nTEST\\n\\n \\n\\nTEST\\n\\n \\n\\nTEST\\n\\nTEST\\nTEST, TEST\r
-END:VEVENT\r
-END:VCALENDAR\r
-
-ICS;
-
- $obj = Reader::read($event);
- $this->assertEquals($event, $obj->serialize());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ParameterTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/ParameterTest.php
deleted file mode 100644
index e4f973115fb..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ParameterTest.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-namespace Sabre\VObject;
-
-class ParameterTest extends \PHPUnit_Framework_TestCase {
-
- function testSetup() {
-
- $cal = new Component\VCalendar();
-
- $param = new Parameter($cal, 'name', 'value');
- $this->assertEquals('NAME', $param->name);
- $this->assertEquals('value', $param->getValue());
-
- }
-
- function testSetupNameLess() {
-
- $card = new Component\VCard();
-
- $param = new Parameter($card, null, 'URL');
- $this->assertEquals('VALUE', $param->name);
- $this->assertEquals('URL', $param->getValue());
- $this->assertTrue($param->noName);
-
- }
-
- function testModify() {
-
- $cal = new Component\VCalendar();
-
- $param = new Parameter($cal, 'name', null);
- $param->addValue(1);
- $this->assertEquals([1], $param->getParts());
-
- $param->setParts([1, 2]);
- $this->assertEquals([1, 2], $param->getParts());
-
- $param->addValue(3);
- $this->assertEquals([1, 2, 3], $param->getParts());
-
- $param->setValue(4);
- $param->addValue(5);
- $this->assertEquals([4, 5], $param->getParts());
-
- }
-
- function testCastToString() {
-
- $cal = new Component\VCalendar();
- $param = new Parameter($cal, 'name', 'value');
- $this->assertEquals('value', $param->__toString());
- $this->assertEquals('value', (string)$param);
-
- }
-
- function testCastNullToString() {
-
- $cal = new Component\VCalendar();
- $param = new Parameter($cal, 'name', null);
- $this->assertEquals('', $param->__toString());
- $this->assertEquals('', (string)$param);
-
- }
-
- function testSerialize() {
-
- $cal = new Component\VCalendar();
- $param = new Parameter($cal, 'name', 'value');
- $this->assertEquals('NAME=value', $param->serialize());
-
- }
-
- function testSerializeEmpty() {
-
- $cal = new Component\VCalendar();
- $param = new Parameter($cal, 'name', null);
- $this->assertEquals('NAME=', $param->serialize());
-
- }
-
- function testSerializeComplex() {
-
- $cal = new Component\VCalendar();
- $param = new Parameter($cal, 'name', ["val1", "val2;", "val3^", "val4\n", "val5\""]);
- $this->assertEquals('NAME=val1,"val2;","val3^^","val4^n","val5^\'"', $param->serialize());
-
- }
-
- /**
- * iCal 7.0 (OSX 10.9) has major issues with the EMAIL property, when the
- * value contains a plus sign, and it's not quoted.
- *
- * So we specifically added support for that.
- */
- function testSerializePlusSign() {
-
- $cal = new Component\VCalendar();
- $param = new Parameter($cal, 'EMAIL', "user+something@example.org");
- $this->assertEquals('EMAIL="user+something@example.org"', $param->serialize());
-
- }
-
- function testIterate() {
-
- $cal = new Component\VCalendar();
-
- $param = new Parameter($cal, 'name', [1, 2, 3, 4]);
- $result = [];
-
- foreach ($param as $value) {
- $result[] = $value;
- }
-
- $this->assertEquals([1, 2, 3, 4], $result);
-
- }
-
- function testSerializeColon() {
-
- $cal = new Component\VCalendar();
- $param = new Parameter($cal, 'name', 'va:lue');
- $this->assertEquals('NAME="va:lue"', $param->serialize());
-
- }
-
- function testSerializeSemiColon() {
-
- $cal = new Component\VCalendar();
- $param = new Parameter($cal, 'name', 'va;lue');
- $this->assertEquals('NAME="va;lue"', $param->serialize());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Parser/JsonTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Parser/JsonTest.php
deleted file mode 100644
index c8725dfd06a..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Parser/JsonTest.php
+++ /dev/null
@@ -1,395 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Parser;
-
-use
- Sabre\VObject;
-
-class JsonTest extends \PHPUnit_Framework_TestCase {
-
- function testRoundTripJCard() {
-
- $input = [
- "vcard",
- [
- [
- "version",
- new \StdClass(),
- "text",
- "4.0"
- ],
- [
- "prodid",
- new \StdClass(),
- "text",
- "-//Sabre//Sabre VObject " . VObject\Version::VERSION . "//EN",
- ],
- [
- "uid",
- new \StdClass(),
- "text",
- "foo",
- ],
- [
- "bday",
- new \StdClass(),
- "date-and-or-time",
- "1985-04-07",
- ],
- [
- "bday",
- (object)[
- 'x-param' => [1,2],
- ],
- "date",
- "1979-12-25",
- ],
- [
- "bday",
- new \StdClass(),
- "date-time",
- "1979-12-25T02:00:00",
- ],
- [
- "rev",
- new \StdClass(),
- "timestamp",
- "1995-10-31T22:27:10Z",
- ],
- [
- "lang",
- new \StdClass(),
- "language-tag",
- "nl",
- ],
- [
- "n",
- new \StdClass(),
- "text",
- ["Last", "First", "Middle", "", ""],
- ],
- [
- "tel",
- (object)[
- "group" => "item1",
- ],
- "text",
- "+1 555 123456",
- ],
- [
- "x-ab-label",
- (object)[
- "group" => "item1",
- ],
- "unknown",
- "Walkie Talkie",
- ],
- [
- "adr",
- new \StdClass(),
- "text",
- [
- "",
- "",
- ["My Street", "Left Side", "Second Shack"],
- "Hometown",
- "PA",
- "18252",
- "U.S.A",
- ],
- ],
-
- [
- "x-truncated",
- new \StdClass(),
- "date",
- "--12-25",
- ],
- [
- "x-time-local",
- new \StdClass(),
- "time",
- "12:30:00"
- ],
- [
- "x-time-utc",
- new \StdClass(),
- "time",
- "12:30:00Z"
- ],
- [
- "x-time-offset",
- new \StdClass(),
- "time",
- "12:30:00-08:00"
- ],
- [
- "x-time-reduced",
- new \StdClass(),
- "time",
- "23"
- ],
- [
- "x-time-truncated",
- new \StdClass(),
- "time",
- "--30"
- ],
- [
- "x-karma-points",
- new \StdClass(),
- "integer",
- 42
- ],
- [
- "x-grade",
- new \StdClass(),
- "float",
- 1.3
- ],
- [
- "tz",
- new \StdClass(),
- "utc-offset",
- "-05:00",
- ],
- ],
- ];
-
- $parser = new Json(json_encode($input));
- $vobj = $parser->parse();
-
- $version = VObject\Version::VERSION;
-
- $result = $vobj->serialize();
- $expected = <<<VCF
-BEGIN:VCARD
-VERSION:4.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-UID:foo
-BDAY:1985-04-07
-BDAY;X-PARAM=1,2;VALUE=DATE:1979-12-25
-BDAY;VALUE=DATE-TIME:1979-12-25T02:00:00
-REV:1995-10-31T22:27:10Z
-LANG:nl
-N:Last;First;Middle;;
-item1.TEL:+1 555 123456
-item1.X-AB-LABEL:Walkie Talkie
-ADR:;;My Street,Left Side,Second Shack;Hometown;PA;18252;U.S.A
-X-TRUNCATED;VALUE=DATE:--12-25
-X-TIME-LOCAL;VALUE=TIME:123000
-X-TIME-UTC;VALUE=TIME:123000Z
-X-TIME-OFFSET;VALUE=TIME:123000-0800
-X-TIME-REDUCED;VALUE=TIME:23
-X-TIME-TRUNCATED;VALUE=TIME:--30
-X-KARMA-POINTS;VALUE=INTEGER:42
-X-GRADE;VALUE=FLOAT:1.3
-TZ;VALUE=UTC-OFFSET:-0500
-END:VCARD
-
-VCF;
- $this->assertEquals($expected, str_replace("\r", "", $result));
-
- $this->assertEquals(
- $input,
- $vobj->jsonSerialize()
- );
-
- }
-
- function testRoundTripJCal() {
-
- $input = [
- "vcalendar",
- [
- [
- "version",
- new \StdClass(),
- "text",
- "2.0"
- ],
- [
- "prodid",
- new \StdClass(),
- "text",
- "-//Sabre//Sabre VObject " . VObject\Version::VERSION . "//EN",
- ],
- [
- "calscale",
- new \StdClass(),
- "text",
- "GREGORIAN"
- ],
- ],
- [
- ["vevent",
- [
- [
- "uid", new \StdClass(), "text", "foo",
- ],
- [
- "dtstart", new \StdClass(), "date", "2013-05-26",
- ],
- [
- "duration", new \StdClass(), "duration", "P1D",
- ],
- [
- "categories", new \StdClass(), "text", "home", "testing",
- ],
- [
- "created", new \StdClass(), "date-time", "2013-05-26T18:10:00Z",
- ],
- [
- "attach", new \StdClass(), "binary", base64_encode('attachment')
- ],
- [
- "attendee", new \StdClass(), "cal-address", "mailto:armin@example.org",
- ],
- [
- "attendee",
- (object)[
- "cn" => "Dominik",
- "partstat" => "DECLINED",
- ],
- "cal-address",
- "mailto:dominik@example.org"
- ],
- [
- "geo", new \StdClass(), "float", [51.96668, 7.61876],
- ],
- [
- "sequence", new \StdClass(), "integer", 5
- ],
- [
- "freebusy", new \StdClass(), "period", ["2013-05-26T21:02:13", "PT1H"], ["2013-06-26T12:00:00", "2013-06-26T13:00:00"],
- ],
- [
- "url", new \StdClass(), "uri", "http://example.org/",
- ],
- [
- "tzoffsetfrom", new \StdClass(), "utc-offset", "+05:00",
- ],
- [
- "rrule", new \StdClass(), "recur", [
- 'freq' => 'WEEKLY',
- 'byday' => ['MO', 'TU'],
- ],
- ],
- [
- "x-bool", new \StdClass(), "boolean", true
- ],
- [
- "x-time", new \StdClass(), "time", "08:00:00",
- ],
- [
- "request-status",
- new \StdClass(),
- "text",
- ["2.0", "Success"],
- ],
- [
- "request-status",
- new \StdClass(),
- "text",
- ["3.7", "Invalid Calendar User", "ATTENDEE:mailto:jsmith@example.org"],
- ],
- ],
- [
- ["valarm",
- [
- [
- "action", new \StdClass(), "text", "DISPLAY",
- ],
- ],
- [],
- ],
- ],
- ]
- ],
- ];
-
- $parser = new Json(json_encode($input));
- $vobj = $parser->parse();
- $result = $vobj->serialize();
-
- $version = VObject\Version::VERSION;
-
- $expected = <<<VCF
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sabre//Sabre VObject $version//EN
-CALSCALE:GREGORIAN
-BEGIN:VEVENT
-UID:foo
-DTSTART;VALUE=DATE:20130526
-DURATION:P1D
-CATEGORIES:home,testing
-CREATED:20130526T181000Z
-ATTACH;VALUE=BINARY:YXR0YWNobWVudA==
-ATTENDEE:mailto:armin@example.org
-ATTENDEE;CN=Dominik;PARTSTAT=DECLINED:mailto:dominik@example.org
-GEO:51.96668;7.61876
-SEQUENCE:5
-FREEBUSY:20130526T210213/PT1H,20130626T120000/20130626T130000
-URL;VALUE=URI:http://example.org/
-TZOFFSETFROM:+0500
-RRULE:FREQ=WEEKLY;BYDAY=MO,TU
-X-BOOL;VALUE=BOOLEAN:TRUE
-X-TIME;VALUE=TIME:080000
-REQUEST-STATUS:2.0;Success
-REQUEST-STATUS:3.7;Invalid Calendar User;ATTENDEE:mailto:jsmith@example.org
-BEGIN:VALARM
-ACTION:DISPLAY
-END:VALARM
-END:VEVENT
-END:VCALENDAR
-
-VCF;
- $this->assertEquals($expected, str_replace("\r", "", $result));
-
- $this->assertEquals(
- $input,
- $vobj->jsonSerialize()
- );
-
- }
-
- function testParseStreamArg() {
-
- $input = [
- "vcard",
- [
- [
- "FN", new \StdClass(), 'text', "foo",
- ],
- ],
- ];
-
- $stream = fopen('php://memory', 'r+');
- fwrite($stream, json_encode($input));
- rewind($stream);
-
- $result = VObject\Reader::readJson($stream, 0);
- $this->assertEquals('foo', $result->FN->getValue());
-
- }
-
- /**
- * @expectedException \Sabre\VObject\ParseException
- */
- function testParseInvalidData() {
-
- $json = new Json();
- $input = [
- "vlist",
- [
- [
- "FN", new \StdClass(), 'text', "foo",
- ],
- ],
- ];
-
- $json->parse(json_encode($input), 0);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Parser/MimeDirTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Parser/MimeDirTest.php
deleted file mode 100644
index 63219dac2b9..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Parser/MimeDirTest.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Parser;
-
-/**
- * Note that most MimeDir related tests can actually be found in the ReaderTest
- * class one level up.
- */
-class MimeDirTest extends \PHPUnit_Framework_TestCase {
-
- /**
- * @expectedException \Sabre\VObject\ParseException
- */
- function testParseError() {
-
- $mimeDir = new MimeDir();
- $mimeDir->parse(fopen(__FILE__, 'a'));
-
- }
-
- function testDecodeLatin1() {
-
- $vcard = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-FN:umlaut u - \xFC
-END:VCARD\n
-VCF;
-
- $mimeDir = new MimeDir();
- $mimeDir->setCharset('ISO-8859-1');
- $vcard = $mimeDir->parse($vcard);
- $this->assertEquals("umlaut u - \xC3\xBC", $vcard->FN->getValue());
-
- }
-
- function testDecodeInlineLatin1() {
-
- $vcard = <<<VCF
-BEGIN:VCARD
-VERSION:2.1
-FN;CHARSET=ISO-8859-1:umlaut u - \xFC
-END:VCARD\n
-VCF;
-
- $mimeDir = new MimeDir();
- $vcard = $mimeDir->parse($vcard);
- $this->assertEquals("umlaut u - \xC3\xBC", $vcard->FN->getValue());
-
- }
-
- function testIgnoreCharsetVCard30() {
-
- $vcard = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-FN;CHARSET=unknown:foo-bar - \xFC
-END:VCARD\n
-VCF;
-
- $mimeDir = new MimeDir();
- $vcard = $mimeDir->parse($vcard);
- $this->assertEquals("foo-bar - \xFC", $vcard->FN->getValue());
-
- }
-
- function testDontDecodeLatin1() {
-
- $vcard = <<<VCF
-BEGIN:VCARD
-VERSION:4.0
-FN:umlaut u - \xFC
-END:VCARD\n
-VCF;
-
- $mimeDir = new MimeDir();
- $vcard = $mimeDir->parse($vcard);
- // This basically tests that we don't touch the input string if
- // the encoding was set to UTF-8. The result is actually invalid
- // and the validator should report this, but it tests effectively
- // that we pass through the string byte-by-byte.
- $this->assertEquals("umlaut u - \xFC", $vcard->FN->getValue());
-
- }
-
- /**
- * @expectedException \InvalidArgumentException
- */
- function testDecodeUnsupportedCharset() {
-
- $mimeDir = new MimeDir();
- $mimeDir->setCharset('foobar');
-
- }
-
- /**
- * @expectedException \Sabre\VObject\ParseException
- */
- function testDecodeUnsupportedInlineCharset() {
-
- $vcard = <<<VCF
-BEGIN:VCARD
-VERSION:2.1
-FN;CHARSET=foobar:nothing
-END:VCARD\n
-VCF;
-
- $mimeDir = new MimeDir();
- $mimeDir->parse($vcard);
-
- }
-
- function testDecodeWindows1252() {
-
- $vcard = <<<VCF
-BEGIN:VCARD
-VERSION:3.0
-FN:Euro \x80
-END:VCARD\n
-VCF;
-
- $mimeDir = new MimeDir();
- $mimeDir->setCharset('Windows-1252');
- $vcard = $mimeDir->parse($vcard);
- $this->assertEquals("Euro \xE2\x82\xAC", $vcard->FN->getValue());
-
- }
-
- function testDecodeWindows1252Inline() {
-
- $vcard = <<<VCF
-BEGIN:VCARD
-VERSION:2.1
-FN;CHARSET=Windows-1252:Euro \x80
-END:VCARD\n
-VCF;
-
- $mimeDir = new MimeDir();
- $vcard = $mimeDir->parse($vcard);
- $this->assertEquals("Euro \xE2\x82\xAC", $vcard->FN->getValue());
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Parser/QuotedPrintableTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Parser/QuotedPrintableTest.php
deleted file mode 100644
index f40d6a677f4..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Parser/QuotedPrintableTest.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Parser;
-
-use
- Sabre\VObject\Reader;
-
-class QuotedPrintableTest extends \PHPUnit_Framework_TestCase {
-
- function testReadQuotedPrintableSimple() {
-
- $data = "BEGIN:VCARD\r\nLABEL;ENCODING=QUOTED-PRINTABLE:Aach=65n\r\nEND:VCARD";
-
- $result = Reader::read($data);
-
- $this->assertInstanceOf('Sabre\\VObject\\Component', $result);
- $this->assertEquals('VCARD', $result->name);
- $this->assertEquals(1, count($result->children()));
- $this->assertEquals("Aachen", $this->getPropertyValue($result->LABEL));
-
- }
-
- function testReadQuotedPrintableNewlineSoft() {
-
- $data = "BEGIN:VCARD\r\nLABEL;ENCODING=QUOTED-PRINTABLE:Aa=\r\n ch=\r\n en\r\nEND:VCARD";
- $result = Reader::read($data);
-
- $this->assertInstanceOf('Sabre\\VObject\\Component', $result);
- $this->assertEquals('VCARD', $result->name);
- $this->assertEquals(1, count($result->children()));
- $this->assertEquals("Aachen", $this->getPropertyValue($result->LABEL));
-
- }
-
- function testReadQuotedPrintableNewlineHard() {
-
- $data = "BEGIN:VCARD\r\nLABEL;ENCODING=QUOTED-PRINTABLE:Aachen=0D=0A=\r\n Germany\r\nEND:VCARD";
- $result = Reader::read($data);
-
- $this->assertInstanceOf('Sabre\\VObject\\Component', $result);
- $this->assertEquals('VCARD', $result->name);
- $this->assertEquals(1, count($result->children()));
- $this->assertEquals("Aachen\r\nGermany", $this->getPropertyValue($result->LABEL));
-
-
- }
-
- function testReadQuotedPrintableCompatibilityMS() {
-
- $data = "BEGIN:VCARD\r\nLABEL;ENCODING=QUOTED-PRINTABLE:Aachen=0D=0A=\r\nDeutschland:okay\r\nEND:VCARD";
- $result = Reader::read($data, Reader::OPTION_FORGIVING);
-
- $this->assertInstanceOf('Sabre\\VObject\\Component', $result);
- $this->assertEquals('VCARD', $result->name);
- $this->assertEquals(1, count($result->children()));
- $this->assertEquals("Aachen\r\nDeutschland:okay", $this->getPropertyValue($result->LABEL));
-
- }
-
- function testReadQuotesPrintableCompoundValues() {
-
- $data = <<<VCF
-BEGIN:VCARD
-VERSION:2.1
-N:Doe;John;;;
-FN:John Doe
-ADR;WORK;CHARSET=UTF-8;ENCODING=QUOTED-PRINTABLE:;;M=C3=BCnster =
-Str. 1;M=C3=BCnster;;48143;Deutschland
-END:VCARD
-VCF;
-
- $result = Reader::read($data, Reader::OPTION_FORGIVING);
- $this->assertEquals([
- '', '', 'Münster Str. 1', 'Münster', '', '48143', 'Deutschland'
- ], $result->ADR->getParts());
-
-
- }
-
- private function getPropertyValue(\Sabre\VObject\Property $property) {
-
- return (string)$property;
-
- /*
- $param = $property['encoding'];
- if ($param !== null) {
- $encoding = strtoupper((string)$param);
- if ($encoding === 'QUOTED-PRINTABLE') {
- $value = quoted_printable_decode($value);
- } else {
- throw new Exception();
- }
- }
-
- $param = $property['charset'];
- if ($param !== null) {
- $charset = strtoupper((string)$param);
- if ($charset !== 'UTF-8') {
- $value = mb_convert_encoding($value, 'UTF-8', $charset);
- }
- } else {
- $value = StringUtil::convertToUTF8($value);
- }
-
- return $value;
- */
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Parser/XmlTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Parser/XmlTest.php
deleted file mode 100644
index b8ba67d1719..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Parser/XmlTest.php
+++ /dev/null
@@ -1,2893 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Parser;
-
-use Sabre\VObject;
-
-class XmlTest extends \PHPUnit_Framework_TestCase {
-
- use VObject\PHPUnitAssertions;
-
- function testRFC6321Example1() {
-
- $this->assertXMLEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <calscale>
- <text>GREGORIAN</text>
- </calscale>
- <prodid>
- <text>-//Example Inc.//Example Calendar//EN</text>
- </prodid>
- <version>
- <text>2.0</text>
- </version>
- </properties>
- <components>
- <vevent>
- <properties>
- <dtstamp>
- <date-time>2008-02-05T19:12:24Z</date-time>
- </dtstamp>
- <dtstart>
- <date>2008-10-06</date>
- </dtstart>
- <summary>
- <text>Planning meeting</text>
- </summary>
- <uid>
- <text>4088E990AD89CB3DBB484909</text>
- </uid>
- </properties>
- </vevent>
- </components>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- // VERSION comes first because this is required by vCard 4.0.
- 'VERSION:2.0' . "\n" .
- 'CALSCALE:GREGORIAN' . "\n" .
- 'PRODID:-//Example Inc.//Example Calendar//EN' . "\n" .
- 'BEGIN:VEVENT' . "\n" .
- 'DTSTAMP:20080205T191224Z' . "\n" .
- 'DTSTART;VALUE=DATE:20081006' . "\n" .
- 'SUMMARY:Planning meeting' . "\n" .
- 'UID:4088E990AD89CB3DBB484909' . "\n" .
- 'END:VEVENT' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- function testRFC6321Example2() {
-
- $xml = <<<XML
-<?xml version="1.0" encoding="UTF-8" ?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <prodid>
- <text>-//Example Inc.//Example Client//EN</text>
- </prodid>
- <version>
- <text>2.0</text>
- </version>
- </properties>
- <components>
- <vtimezone>
- <properties>
- <last-modified>
- <date-time>2004-01-10T03:28:45Z</date-time>
- </last-modified>
- <tzid><text>US/Eastern</text></tzid>
- </properties>
- <components>
- <daylight>
- <properties>
- <dtstart>
- <date-time>2000-04-04T02:00:00</date-time>
- </dtstart>
- <rrule>
- <recur>
- <freq>YEARLY</freq>
- <byday>1SU</byday>
- <bymonth>4</bymonth>
- </recur>
- </rrule>
- <tzname>
- <text>EDT</text>
- </tzname>
- <tzoffsetfrom>
- <utc-offset>-05:00</utc-offset>
- </tzoffsetfrom>
- <tzoffsetto>
- <utc-offset>-04:00</utc-offset>
- </tzoffsetto>
- </properties>
- </daylight>
- <standard>
- <properties>
- <dtstart>
- <date-time>2000-10-26T02:00:00</date-time>
- </dtstart>
- <rrule>
- <recur>
- <freq>YEARLY</freq>
- <byday>-1SU</byday>
- <bymonth>10</bymonth>
- </recur>
- </rrule>
- <tzname>
- <text>EST</text>
- </tzname>
- <tzoffsetfrom>
- <utc-offset>-04:00</utc-offset>
- </tzoffsetfrom>
- <tzoffsetto>
- <utc-offset>-05:00</utc-offset>
- </tzoffsetto>
- </properties>
- </standard>
- </components>
- </vtimezone>
- <vevent>
- <properties>
- <dtstamp>
- <date-time>2006-02-06T00:11:21Z</date-time>
- </dtstamp>
- <dtstart>
- <parameters>
- <tzid><text>US/Eastern</text></tzid>
- </parameters>
- <date-time>2006-01-02T12:00:00</date-time>
- </dtstart>
- <duration>
- <duration>PT1H</duration>
- </duration>
- <rrule>
- <recur>
- <freq>DAILY</freq>
- <count>5</count>
- </recur>
- </rrule>
- <rdate>
- <parameters>
- <tzid><text>US/Eastern</text></tzid>
- </parameters>
- <period>
- <start>2006-01-02T15:00:00</start>
- <duration>PT2H</duration>
- </period>
- </rdate>
- <summary>
- <text>Event #2</text>
- </summary>
- <description>
- <text>We are having a meeting all this week at 12
-pm for one hour, with an additional meeting on the first day
-2 hours long.
Please bring your own lunch for the 12 pm
-meetings.</text>
- </description>
- <uid>
- <text>00959BC664CA650E933C892C@example.com</text>
- </uid>
- </properties>
- </vevent>
- <vevent>
- <properties>
- <dtstamp>
- <date-time>2006-02-06T00:11:21Z</date-time>
- </dtstamp>
- <dtstart>
- <parameters>
- <tzid><text>US/Eastern</text></tzid>
- </parameters>
- <date-time>2006-01-04T14:00:00</date-time>
- </dtstart>
- <duration>
- <duration>PT1H</duration>
- </duration>
- <recurrence-id>
- <parameters>
- <tzid><text>US/Eastern</text></tzid>
- </parameters>
- <date-time>2006-01-04T12:00:00</date-time>
- </recurrence-id>
- <summary>
- <text>Event #2 bis</text>
- </summary>
- <uid>
- <text>00959BC664CA650E933C892C@example.com</text>
- </uid>
- </properties>
- </vevent>
- </components>
- </vcalendar>
-</icalendar>
-XML;
-
- $component = VObject\Reader::readXML($xml);
- $this->assertVObjectEqualsVObject(
- 'BEGIN:VCALENDAR' . "\n" .
- 'VERSION:2.0' . "\n" .
- 'PRODID:-//Example Inc.//Example Client//EN' . "\n" .
- 'BEGIN:VTIMEZONE' . "\n" .
- 'LAST-MODIFIED:20040110T032845Z' . "\n" .
- 'TZID:US/Eastern' . "\n" .
- 'BEGIN:DAYLIGHT' . "\n" .
- 'DTSTART:20000404T020000' . "\n" .
- 'RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4' . "\n" .
- 'TZNAME:EDT' . "\n" .
- 'TZOFFSETFROM:-0500' . "\n" .
- 'TZOFFSETTO:-0400' . "\n" .
- 'END:DAYLIGHT' . "\n" .
- 'BEGIN:STANDARD' . "\n" .
- 'DTSTART:20001026T020000' . "\n" .
- 'RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10' . "\n" .
- 'TZNAME:EST' . "\n" .
- 'TZOFFSETFROM:-0400' . "\n" .
- 'TZOFFSETTO:-0500' . "\n" .
- 'END:STANDARD' . "\n" .
- 'END:VTIMEZONE' . "\n" .
- 'BEGIN:VEVENT' . "\n" .
- 'DTSTAMP:20060206T001121Z' . "\n" .
- 'DTSTART;TZID=US/Eastern:20060102T120000' . "\n" .
- 'DURATION:PT1H' . "\n" .
- 'RRULE:FREQ=DAILY;COUNT=5' . "\n" .
- 'RDATE;TZID=US/Eastern;VALUE=PERIOD:20060102T150000/PT2H' . "\n" .
- 'SUMMARY:Event #2' . "\n" .
- 'DESCRIPTION:We are having a meeting all this week at 12\npm for one hour\, ' . "\n" .
- ' with an additional meeting on the first day\n2 hours long.\nPlease bring y' . "\n" .
- ' our own lunch for the 12 pm\nmeetings.' . "\n" .
- 'UID:00959BC664CA650E933C892C@example.com' . "\n" .
- 'END:VEVENT' . "\n" .
- 'BEGIN:VEVENT' . "\n" .
- 'DTSTAMP:20060206T001121Z' . "\n" .
- 'DTSTART;TZID=US/Eastern:20060104T140000' . "\n" .
- 'DURATION:PT1H' . "\n" .
- 'RECURRENCE-ID;TZID=US/Eastern:20060104T120000' . "\n" .
- 'SUMMARY:Event #2 bis' . "\n" .
- 'UID:00959BC664CA650E933C892C@example.com' . "\n" .
- 'END:VEVENT' . "\n" .
- 'END:VCALENDAR' . "\n",
- VObject\Writer::write($component)
- );
-
- }
-
- /**
- * iCalendar Stream.
- */
- function testRFC6321Section3_2() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar/>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
- }
-
- /**
- * All components exist.
- */
- function testRFC6321Section3_3() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <components>
- <vtimezone/>
- <vevent/>
- <vtodo/>
- <vjournal/>
- <vfreebusy/>
- <standard/>
- <daylight/>
- <valarm/>
- </components>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'BEGIN:VTIMEZONE' . "\n" .
- 'END:VTIMEZONE' . "\n" .
- 'BEGIN:VEVENT' . "\n" .
- 'END:VEVENT' . "\n" .
- 'BEGIN:VTODO' . "\n" .
- 'END:VTODO' . "\n" .
- 'BEGIN:VJOURNAL' . "\n" .
- 'END:VJOURNAL' . "\n" .
- 'BEGIN:VFREEBUSY' . "\n" .
- 'END:VFREEBUSY' . "\n" .
- 'BEGIN:STANDARD' . "\n" .
- 'END:STANDARD' . "\n" .
- 'BEGIN:DAYLIGHT' . "\n" .
- 'END:DAYLIGHT' . "\n" .
- 'BEGIN:VALARM' . "\n" .
- 'END:VALARM' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- /**
- * Properties, Special Cases, GEO.
- */
- function testRFC6321Section3_4_1_2() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <geo>
- <latitude>37.386013</latitude>
- <longitude>-122.082932</longitude>
- </geo>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'GEO:37.386013;-122.082932' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- /**
- * Properties, Special Cases, REQUEST-STATUS.
- */
- function testRFC6321Section3_4_1_3() {
-
- // Example 1 of RFC5545, Section 3.8.8.3.
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <request-status>
- <code>2.0</code>
- <description>Success</description>
- </request-status>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'REQUEST-STATUS:2.0;Success' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- // Example 2 of RFC5545, Section 3.8.8.3.
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <request-status>
- <code>3.1</code>
- <description>Invalid property value</description>
- <data>DTSTART:96-Apr-01</data>
- </request-status>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'REQUEST-STATUS:3.1;Invalid property value;DTSTART:96-Apr-01' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- // Example 3 of RFC5545, Section 3.8.8.3.
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <request-status>
- <code>2.8</code>
- <description>Success, repeating event ignored. Scheduled as a single event.</description>
- <data>RRULE:FREQ=WEEKLY;INTERVAL=2</data>
- </request-status>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'REQUEST-STATUS:2.8;Success\, repeating event ignored. Scheduled as a single' . "\n" .
- ' event.;RRULE:FREQ=WEEKLY\;INTERVAL=2' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- // Example 4 of RFC5545, Section 3.8.8.3.
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <request-status>
- <code>4.1</code>
- <description>Event conflict. Date-time is busy.</description>
- </request-status>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'REQUEST-STATUS:4.1;Event conflict. Date-time is busy.' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- // Example 5 of RFC5545, Section 3.8.8.3.
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <request-status>
- <code>3.7</code>
- <description>Invalid calendar user</description>
- <data>ATTENDEE:mailto:jsmith@example.com</data>
- </request-status>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'REQUEST-STATUS:3.7;Invalid calendar user;ATTENDEE:mailto:jsmith@example.com' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- /**
- * Values, Binary.
- */
- function testRFC6321Section3_6_1() {
-
- $this->assertXMLEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <attach>
- <binary>SGVsbG8gV29ybGQh</binary>
- </attach>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'ATTACH:SGVsbG8gV29ybGQh' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- // In vCard 4, BINARY no longer exists and is replaced by URI.
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <attach>
- <uri>SGVsbG8gV29ybGQh</uri>
- </attach>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'ATTACH:SGVsbG8gV29ybGQh' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- /**
- * Values, Boolean.
- */
- function testRFC6321Section3_6_2() {
-
- $this->assertXMLEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <attendee>
- <parameters>
- <rsvp><boolean>true</boolean></rsvp>
- </parameters>
- <cal-address>mailto:cyrus@example.com</cal-address>
- </attendee>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'ATTENDEE;RSVP=true:mailto:cyrus@example.com' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- /**
- * Values, Calendar User Address.
- */
- function testRFC6321Section3_6_3() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <attendee>
- <cal-address>mailto:cyrus@example.com</cal-address>
- </attendee>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'ATTENDEE:mailto:cyrus@example.com' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- /**
- * Values, Date.
- */
- function testRFC6321Section3_6_4() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <dtstart>
- <date>2011-05-17</date>
- </dtstart>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'DTSTART;VALUE=DATE:20110517' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- /**
- * Values, Date-Time.
- */
- function testRFC6321Section3_6_5() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <dtstart>
- <date-time>2011-05-17T12:00:00</date-time>
- </dtstart>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'DTSTART:20110517T120000' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- /**
- * Values, Duration.
- */
- function testRFC6321Section3_6_6() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <duration>
- <duration>P1D</duration>
- </duration>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'DURATION:P1D' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- /**
- * Values, Float.
- */
- function testRFC6321Section3_6_7() {
-
- // GEO uses <float /> with a positive and a non-negative numbers.
- $this->testRFC6321Section3_4_1_2();
-
- }
-
- /**
- * Values, Integer.
- */
- function testRFC6321Section3_6_8() {
-
- $this->assertXMLEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <foo>
- <integer>42</integer>
- </foo>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'FOO:42' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- $this->assertXMLEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <foo>
- <integer>-42</integer>
- </foo>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'FOO:-42' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- /**
- * Values, Period of Time.
- */
- function testRFC6321Section3_6_9() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <freebusy>
- <period>
- <start>2011-05-17T12:00:00</start>
- <duration>P1H</duration>
- </period>
- </freebusy>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'FREEBUSY:20110517T120000/P1H' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <freebusy>
- <period>
- <start>2011-05-17T12:00:00</start>
- <end>2012-05-17T12:00:00</end>
- </period>
- </freebusy>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'FREEBUSY:20110517T120000/20120517T120000' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- /**
- * Values, Recurrence Rule.
- */
- function testRFC6321Section3_6_10() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <rrule>
- <recur>
- <freq>YEARLY</freq>
- <count>5</count>
- <byday>-1SU</byday>
- <bymonth>10</bymonth>
- </recur>
- </rrule>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'RRULE:FREQ=YEARLY;COUNT=5;BYDAY=-1SU;BYMONTH=10' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- /**
- * Values, Text.
- */
- function testRFC6321Section3_6_11() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <calscale>
- <text>GREGORIAN</text>
- </calscale>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'CALSCALE:GREGORIAN' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- /**
- * Values, Time.
- */
- function testRFC6321Section3_6_12() {
-
- $this->assertXMLEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <foo>
- <time>12:00:00</time>
- </foo>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'FOO:120000' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- /**
- * Values, URI.
- */
- function testRFC6321Section3_6_13() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <attach>
- <uri>http://calendar.example.com</uri>
- </attach>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'ATTACH:http://calendar.example.com' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- /**
- * Values, UTC Offset.
- */
- function testRFC6321Section3_6_14() {
-
- // Example 1 of RFC5545, Section 3.3.14.
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <tzoffsetfrom>
- <utc-offset>-05:00</utc-offset>
- </tzoffsetfrom>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'TZOFFSETFROM:-0500' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- // Example 2 of RFC5545, Section 3.3.14.
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <tzoffsetfrom>
- <utc-offset>+01:00</utc-offset>
- </tzoffsetfrom>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'TZOFFSETFROM:+0100' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- /**
- * Handling Unrecognized Properties or Parameters.
- */
- function testRFC6321Section5() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <x-property>
- <unknown>20110512T120000Z</unknown>
- </x-property>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'X-PROPERTY:20110512T120000Z' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <dtstart>
- <parameters>
- <x-param>
- <text>PT30M</text>
- </x-param>
- </parameters>
- <date-time>2011-05-12T13:00:00Z</date-time>
- </dtstart>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'DTSTART;X-PARAM=PT30M:20110512T130000Z' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- function testRDateWithDateTime() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <rdate>
- <date-time>2008-02-05T19:12:24Z</date-time>
- </rdate>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'RDATE:20080205T191224Z' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <rdate>
- <date-time>2008-02-05T19:12:24Z</date-time>
- <date-time>2009-02-05T19:12:24Z</date-time>
- </rdate>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'RDATE:20080205T191224Z,20090205T191224Z' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- function testRDateWithDate() {
-
- $this->assertXMLEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <rdate>
- <date>2008-10-06</date>
- </rdate>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'RDATE:20081006' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- $this->assertXMLEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <rdate>
- <date>2008-10-06</date>
- <date>2009-10-06</date>
- <date>2010-10-06</date>
- </rdate>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'RDATE:20081006,20091006,20101006' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- function testRDateWithPeriod() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <rdate>
- <parameters>
- <tzid>
- <text>US/Eastern</text>
- </tzid>
- </parameters>
- <period>
- <start>2006-01-02T15:00:00</start>
- <duration>PT2H</duration>
- </period>
- </rdate>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'RDATE;TZID=US/Eastern;VALUE=PERIOD:20060102T150000/PT2H' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- $this->assertXMLEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<icalendar xmlns="urn:ietf:params:xml:ns:icalendar-2.0">
- <vcalendar>
- <properties>
- <rdate>
- <parameters>
- <tzid>
- <text>US/Eastern</text>
- </tzid>
- </parameters>
- <period>
- <start>2006-01-02T15:00:00</start>
- <duration>PT2H</duration>
- </period>
- <period>
- <start>2008-01-02T15:00:00</start>
- <duration>PT1H</duration>
- </period>
- </rdate>
- </properties>
- </vcalendar>
-</icalendar>
-XML
-,
- 'BEGIN:VCALENDAR' . "\n" .
- 'RDATE;TZID=US/Eastern;VALUE=PERIOD:20060102T150000/PT2H,20080102T150000/PT1' . "\n" .
- ' H' . "\n" .
- 'END:VCALENDAR' . "\n"
- );
-
- }
-
- /**
- * Basic example.
- */
- function testRFC6351Basic() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <fn>
- <text>J. Doe</text>
- </fn>
- <n>
- <surname>Doe</surname>
- <given>J.</given>
- <additional/>
- <prefix/>
- <suffix/>
- </n>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'FN:J. Doe' . "\n" .
- 'N:Doe;J.;;;' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Example 1.
- */
- function testRFC6351Example1() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <fn>
- <text>J. Doe</text>
- </fn>
- <n>
- <surname>Doe</surname>
- <given>J.</given>
- <additional/>
- <prefix/>
- <suffix/>
- </n>
- <x-file>
- <parameters>
- <mediatype>
- <text>image/jpeg</text>
- </mediatype>
- </parameters>
- <unknown>alien.jpg</unknown>
- </x-file>
- <x1:a href="http://www.example.com" xmlns:x1="http://www.w3.org/1999/xhtml">My web page!</x1:a>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'FN:J. Doe' . "\n" .
- 'N:Doe;J.;;;' . "\n" .
- 'X-FILE;MEDIATYPE=image/jpeg:alien.jpg' . "\n" .
- 'XML:<a xmlns="http://www.w3.org/1999/xhtml" href="http://www.example.com">M' . "\n" .
- ' y web page!</a>' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Design Considerations.
- */
- function testRFC6351Section5() {
-
- $this->assertXMLEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <tel>
- <parameters>
- <type>
- <text>voice</text>
- <text>video</text>
- </type>
- </parameters>
- <uri>tel:+1-555-555-555</uri>
- </tel>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'TEL;TYPE="voice,video":tel:+1-555-555-555' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <tel>
- <parameters>
- <type>
- <text>voice</text>
- <text>video</text>
- </type>
- </parameters>
- <text>tel:+1-555-555-555</text>
- </tel>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'TEL;TYPE="voice,video":tel:+1-555-555-555' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Design Considerations.
- */
- function testRFC6351Section5Group() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <tel>
- <text>tel:+1-555-555-556</text>
- </tel>
- <group name="contact">
- <tel>
- <text>tel:+1-555-555-555</text>
- </tel>
- <fn>
- <text>Gordon</text>
- </fn>
- </group>
- <group name="media">
- <fn>
- <text>Gordon</text>
- </fn>
- </group>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'TEL:tel:+1-555-555-556' . "\n" .
- 'contact.TEL:tel:+1-555-555-555' . "\n" .
- 'contact.FN:Gordon' . "\n" .
- 'media.FN:Gordon' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Extensibility.
- */
- function testRFC6351Section5_1_NoNamespace() {
-
- $this->assertXMLEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <x-my-prop>
- <parameters>
- <pref>
- <integer>1</integer>
- </pref>
- </parameters>
- <text>value goes here</text>
- </x-my-prop>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'X-MY-PROP;PREF=1:value goes here' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Section 4.3.1 of Relax NG Schema: value-date.
- */
- function testRFC6351ValueDateWithYearMonthDay() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>20150128</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:20150128' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Section 4.3.1 of Relax NG Schema: value-date.
- */
- function testRFC6351ValueDateWithYearMonth() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>2015-01</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:2015-01' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Section 4.3.1 of Relax NG Schema: value-date.
- */
- function testRFC6351ValueDateWithMonth() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>--01</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:--01' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Section 4.3.1 of Relax NG Schema: value-date.
- */
- function testRFC6351ValueDateWithMonthDay() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>--0128</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:--0128' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Section 4.3.1 of Relax NG Schema: value-date.
- */
- function testRFC6351ValueDateWithDay() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>---28</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:---28' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Section 4.3.2 of Relax NG Schema: value-time.
- */
- function testRFC6351ValueTimeWithHour() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>13</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:13' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Section 4.3.2 of Relax NG Schema: value-time.
- */
- function testRFC6351ValueTimeWithHourMinute() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>1353</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:1353' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Section 4.3.2 of Relax NG Schema: value-time.
- */
- function testRFC6351ValueTimeWithHourMinuteSecond() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>135301</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:135301' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Section 4.3.2 of Relax NG Schema: value-time.
- */
- function testRFC6351ValueTimeWithMinute() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>-53</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:-53' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Section 4.3.2 of Relax NG Schema: value-time.
- */
- function testRFC6351ValueTimeWithMinuteSecond() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>-5301</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:-5301' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Section 4.3.2 of Relax NG Schema: value-time.
- */
- function testRFC6351ValueTimeWithSecond() {
-
- $this->assertTrue(true);
-
- /*
- * According to the Relax NG Schema, there is a conflict between
- * value-date and value-time. The --01 syntax can only match a
- * value-date because of the higher priority set in
- * value-date-and-or-time. So we basically skip this test.
- *
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>--01</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:--01' . "\n" .
- 'END:VCARD' . "\n"
- );
- */
-
- }
-
- /**
- * Section 4.3.2 of Relax NG Schema: value-time.
- */
- function testRFC6351ValueTimeWithSecondZ() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>--01Z</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:--01Z' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Section 4.3.2 of Relax NG Schema: value-time.
- */
- function testRFC6351ValueTimeWithSecondTZ() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>--01+1234</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:--01+1234' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Section 4.3.3 of Relax NG Schema: value-date-time.
- */
- function testRFC6351ValueDateTimeWithYearMonthDayHour() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>20150128T13</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:20150128T13' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Section 4.3.3 of Relax NG Schema: value-date-time.
- */
- function testRFC6351ValueDateTimeWithMonthDayHour() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>--0128T13</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:--0128T13' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Section 4.3.3 of Relax NG Schema: value-date-time.
- */
- function testRFC6351ValueDateTimeWithDayHour() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>---28T13</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:---28T13' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Section 4.3.3 of Relax NG Schema: value-date-time.
- */
- function testRFC6351ValueDateTimeWithDayHourMinute() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>---28T1353</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:---28T1353' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Section 4.3.3 of Relax NG Schema: value-date-time.
- */
- function testRFC6351ValueDateTimeWithDayHourMinuteSecond() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>---28T135301</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:---28T135301' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Section 4.3.3 of Relax NG Schema: value-date-time.
- */
- function testRFC6351ValueDateTimeWithDayHourZ() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>---28T13Z</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:---28T13Z' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Section 4.3.3 of Relax NG Schema: value-date-time.
- */
- function testRFC6351ValueDateTimeWithDayHourTZ() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>---28T13+1234</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:---28T13+1234' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: SOURCE.
- */
- function testRFC6350Section6_1_3() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <source>
- <uri>ldap://ldap.example.com/cn=Babs%20Jensen,%20o=Babsco,%20c=US</uri>
- </source>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'SOURCE:ldap://ldap.example.com/cn=Babs%20Jensen\,%20o=Babsco\,%20c=US' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: KIND.
- */
- function testRFC6350Section6_1_4() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <kind>
- <text>individual</text>
- </kind>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'KIND:individual' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: FN.
- */
- function testRFC6350Section6_2_1() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <fn>
- <text>Mr. John Q. Public, Esq.</text>
- </fn>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'FN:Mr. John Q. Public\, Esq.' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: N.
- */
- function testRFC6350Section6_2_2() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <n>
- <surname>Stevenson</surname>
- <given>John</given>
- <additional>Philip,Paul</additional>
- <prefix>Dr.</prefix>
- <suffix>Jr.,M.D.,A.C.P.</suffix>
- </n>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'N:Stevenson;John;Philip\,Paul;Dr.;Jr.\,M.D.\,A.C.P.' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: NICKNAME.
- */
- function testRFC6350Section6_2_3() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <nickname>
- <text>Jim</text>
- <text>Jimmie</text>
- </nickname>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'NICKNAME:Jim,Jimmie' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: PHOTO.
- */
- function testRFC6350Section6_2_4() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <photo>
- <uri>http://www.example.com/pub/photos/jqpublic.gif</uri>
- </photo>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'PHOTO:http://www.example.com/pub/photos/jqpublic.gif' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- function testRFC6350Section6_2_5() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <bday>
- <date-and-or-time>19531015T231000Z</date-and-or-time>
- </bday>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'BDAY:19531015T231000Z' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- function testRFC6350Section6_2_6() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <anniversary>
- <date-and-or-time>19960415</date-and-or-time>
- </anniversary>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'ANNIVERSARY:19960415' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: GENDER.
- */
- function testRFC6350Section6_2_7() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <gender>
- <sex>Jim</sex>
- <text>Jimmie</text>
- </gender>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'GENDER:Jim;Jimmie' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: ADR.
- */
- function testRFC6350Section6_3_1() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <adr>
- <pobox/>
- <ext/>
- <street>123 Main Street</street>
- <locality>Any Town</locality>
- <region>CA</region>
- <code>91921-1234</code>
- <country>U.S.A.</country>
- </adr>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'ADR:;;123 Main Street;Any Town;CA;91921-1234;U.S.A.' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: TEL.
- */
- function testRFC6350Section6_4_1() {
-
- /**
- * Quoting RFC:
- * > Value type: By default, it is a single free-form text value (for
- * > backward compatibility with vCard 3), but it SHOULD be reset to a
- * > URI value. It is expected that the URI scheme will be "tel", as
- * > specified in [RFC3966], but other schemes MAY be used.
- *
- * So first, we test xCard/URI to vCard/URI.
- * Then, we test xCard/TEXT to vCard/TEXT to xCard/TEXT.
- */
- $this->assertXMLEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <tel>
- <parameters>
- <type>
- <text>home</text>
- </type>
- </parameters>
- <uri>tel:+33-01-23-45-67</uri>
- </tel>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'TEL;TYPE=home:tel:+33-01-23-45-67' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <tel>
- <parameters>
- <type>
- <text>home</text>
- </type>
- </parameters>
- <text>tel:+33-01-23-45-67</text>
- </tel>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'TEL;TYPE=home:tel:+33-01-23-45-67' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: EMAIL.
- */
- function testRFC6350Section6_4_2() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <email>
- <parameters>
- <type>
- <text>work</text>
- </type>
- </parameters>
- <text>jqpublic@xyz.example.com</text>
- </email>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'EMAIL;TYPE=work:jqpublic@xyz.example.com' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: IMPP.
- */
- function testRFC6350Section6_4_3() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <impp>
- <parameters>
- <pref>
- <text>1</text>
- </pref>
- </parameters>
- <uri>xmpp:alice@example.com</uri>
- </impp>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'IMPP;PREF=1:xmpp:alice@example.com' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: LANG.
- */
- function testRFC6350Section6_4_4() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <lang>
- <parameters>
- <type>
- <text>work</text>
- </type>
- <pref>
- <text>2</text>
- </pref>
- </parameters>
- <language-tag>en</language-tag>
- </lang>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'LANG;TYPE=work;PREF=2:en' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: TZ.
- */
- function testRFC6350Section6_5_1() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <tz>
- <text>Raleigh/North America</text>
- </tz>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'TZ:Raleigh/North America' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: GEO.
- */
- function testRFC6350Section6_5_2() {
-
- $this->assertXMLEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <geo>
- <uri>geo:37.386013,-122.082932</uri>
- </geo>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'GEO:geo:37.386013\,-122.082932' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <geo>
- <text>geo:37.386013,-122.082932</text>
- </geo>
- </vcard>
-</vcards>
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'GEO:geo:37.386013\,-122.082932' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: TITLE.
- */
- function testRFC6350Section6_6_1() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<<XML
-<?xml version="1.0" encoding="UTF-8"?>
-<vcards xmlns="urn:ietf:params:xml:ns:vcard-4.0">
- <vcard>
- <title>
- <text>Research Scientist</text>
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'TITLE:Research Scientist' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: ROLE.
- */
- function testRFC6350Section6_6_2() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-
- Project Leader
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'ROLE:Project Leader' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: LOGO.
- */
- function testRFC6350Section6_6_3() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-
- http://www.example.com/pub/logos/abccorp.jpg
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'LOGO:http://www.example.com/pub/logos/abccorp.jpg' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: ORG.
- */
- function testRFC6350Section6_6_4() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-
- ABC, Inc.
- North American Division
- Marketing
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'ORG:ABC\, Inc.;North American Division;Marketing' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: MEMBER.
- */
- function testRFC6350Section6_6_5() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-
- urn:uuid:03a0e51f-d1aa-4385-8a53-e29025acd8af
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'MEMBER:urn:uuid:03a0e51f-d1aa-4385-8a53-e29025acd8af' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-
- mailto:subscriber1@example.com
-
-
- xmpp:subscriber2@example.com
-
-
- sip:subscriber3@example.com
-
-
- tel:+1-418-555-5555
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'MEMBER:mailto:subscriber1@example.com' . "\n" .
- 'MEMBER:xmpp:subscriber2@example.com' . "\n" .
- 'MEMBER:sip:subscriber3@example.com' . "\n" .
- 'MEMBER:tel:+1-418-555-5555' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: RELATED.
- */
- function testRFC6350Section6_6_6() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-
-
-
- friend
-
-
- urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'RELATED;TYPE=friend:urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: CATEGORIES.
- */
- function testRFC6350Section6_7_1() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-
- INTERNET
- IETF
- INDUSTRY
- INFORMATION TECHNOLOGY
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'CATEGORIES:INTERNET,IETF,INDUSTRY,INFORMATION TECHNOLOGY' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: NOTE.
- */
- function testRFC6350Section6_7_2() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-
- Foo, bar
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'NOTE:Foo\, bar' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: PRODID.
- */
- function testRFC6350Section6_7_3() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-
- -//ONLINE DIRECTORY//NONSGML Version 1//EN
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'PRODID:-//ONLINE DIRECTORY//NONSGML Version 1//EN' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- function testRFC6350Section6_7_4() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-
- 19951031T222710Z
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'REV:19951031T222710Z' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: SOUND.
- */
- function testRFC6350Section6_7_5() {
-
- $this->assertXMLEqualsToMimeDir(
-<<
-
-
-
- CID:JOHNQPUBLIC.part8.19960229T080000.xyzMail@example.com
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'SOUND:CID:JOHNQPUBLIC.part8.19960229T080000.xyzMail@example.com' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-
- CID:JOHNQPUBLIC.part8.19960229T080000.xyzMail@example.com
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'SOUND:CID:JOHNQPUBLIC.part8.19960229T080000.xyzMail@example.com' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: UID.
- */
- function testRFC6350Section6_7_6() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-
- urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'UID:urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: CLIENTPIDMAP.
- */
- function testRFC6350Section6_7_7() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-
- 1
- urn:uuid:3df403f4-5924-4bb7-b077-3c711d9eb34b
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'CLIENTPIDMAP:1;urn:uuid:3df403f4-5924-4bb7-b077-3c711d9eb34b' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: URL.
- */
- function testRFC6350Section6_7_8() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-
- http://example.org/restaurant.french/~chezchic.html
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'URL:http://example.org/restaurant.french/~chezchic.html' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: VERSION.
- */
- function testRFC6350Section6_7_9() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: KEY.
- */
- function testRFC6350Section6_8_1() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-
-
-
- application/pgp-keys
-
-
- ftp://example.com/keys/jdoe
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'KEY;MEDIATYPE=application/pgp-keys:ftp://example.com/keys/jdoe' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: FBURL.
- */
- function testRFC6350Section6_9_1() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-
-
-
- 1
-
-
- http://www.example.com/busy/janedoe
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'FBURL;PREF=1:http://www.example.com/busy/janedoe' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: CALADRURI.
- */
- function testRFC6350Section6_9_2() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-
- http://example.com/calendar/jdoe
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'CALADRURI:http://example.com/calendar/jdoe' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: CALURI.
- */
- function testRFC6350Section6_9_3() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-
-
-
- 1
-
-
- http://cal.example.com/calA
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'CALURI;PREF=1:http://cal.example.com/calA' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Property: CAPURI.
- */
- function testRFC6350SectionA_3() {
-
- $this->assertXMLReflexivelyEqualsToMimeDir(
-<<
-
-
-
- http://cap.example.com/capA
-
-
-
-XML
-,
- 'BEGIN:VCARD' . "\n" .
- 'VERSION:4.0' . "\n" .
- 'CAPURI:http://cap.example.com/capA' . "\n" .
- 'END:VCARD' . "\n"
- );
-
- }
-
- /**
- * Check this equality:
- * XML -> object model -> MIME Dir.
- */
- protected function assertXMLEqualsToMimeDir($xml, $mimedir) {
-
- $component = VObject\Reader::readXML($xml);
- $this->assertVObjectEqualsVObject($mimedir, $component);
-
- }
-
- /**
- * Check this (reflexive) equality:
- * XML -> object model -> MIME Dir -> object model -> XML.
- */
- protected function assertXMLReflexivelyEqualsToMimeDir($xml, $mimedir) {
-
- $this->assertXMLEqualsToMimeDir($xml, $mimedir);
-
- $component = VObject\Reader::read($mimedir);
- $this->assertXmlStringEqualsXmlString($xml, VObject\Writer::writeXML($component));
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/BinaryTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/BinaryTest.php
deleted file mode 100644
index 3356b1bd11e..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/BinaryTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
- '3.0']);
- $vcard->add('PHOTO', ['a', 'b']);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/BooleanTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/BooleanTest.php
deleted file mode 100644
index 0c885d37bbe..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/BooleanTest.php
+++ /dev/null
@@ -1,22 +0,0 @@
-assertTrue($vcard->{'X-AWESOME'}->getValue());
- $this->assertFalse($vcard->{'X-SUCKS'}->getValue());
-
- $this->assertEquals('BOOLEAN', $vcard->{'X-AWESOME'}->getValueType());
- $this->assertEquals($input, $vcard->serialize());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/CompoundTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/CompoundTest.php
deleted file mode 100644
index ced0d7a4c70..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/CompoundTest.php
+++ /dev/null
@@ -1,50 +0,0 @@
-createProperty('ORG');
- $elem->setParts($arr);
-
- $this->assertEquals('ABC\, Inc.;North American Division;Marketing\;Sales', $elem->getValue());
- $this->assertEquals(3, count($elem->getParts()));
- $parts = $elem->getParts();
- $this->assertEquals('Marketing;Sales', $parts[2]);
-
- }
-
- function testGetParts() {
-
- $str = 'ABC\, Inc.;North American Division;Marketing\;Sales';
-
- $vcard = new VCard();
- $elem = $vcard->createProperty('ORG');
- $elem->setRawMimeDirValue($str);
-
- $this->assertEquals(3, count($elem->getParts()));
- $parts = $elem->getParts();
- $this->assertEquals('Marketing;Sales', $parts[2]);
- }
-
- function testGetPartsNull() {
-
- $vcard = new VCard();
- $elem = $vcard->createProperty('ORG', null);
-
- $this->assertEquals(0, count($elem->getParts()));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/FloatTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/FloatTest.php
deleted file mode 100644
index f4636518d83..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/FloatTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-parse($input);
-
- $this->assertInstanceOf('Sabre\VObject\Property\FloatValue', $result->{'X-FLOAT'});
-
- $this->assertEquals([
- 0.234,
- 1.245,
- ], $result->{'X-FLOAT'}->getParts());
-
- $this->assertEquals(
- $input,
- $result->serialize()
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/ICalendar/CalAddressTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/ICalendar/CalAddressTest.php
deleted file mode 100644
index fe2a550bffe..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/ICalendar/CalAddressTest.php
+++ /dev/null
@@ -1,32 +0,0 @@
-add('ATTENDEE', $input);
-
- $this->assertEquals(
- $expected,
- $property->getNormalizedValue()
- );
-
- }
-
- function values() {
-
- return [
- ['mailto:a@b.com', 'mailto:a@b.com'],
- ['mailto:a@b.com', 'MAILTO:a@b.com'],
- ['/foo/bar', '/foo/bar'],
- ];
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/ICalendar/DateTimeTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/ICalendar/DateTimeTest.php
deleted file mode 100644
index c89cfe69bca..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/ICalendar/DateTimeTest.php
+++ /dev/null
@@ -1,371 +0,0 @@
-vcal = new VCalendar();
-
- }
-
- function testSetDateTime() {
-
- $tz = new \DateTimeZone('Europe/Amsterdam');
- $dt = new \DateTime('1985-07-04 01:30:00', $tz);
- $dt->setTimeZone($tz);
-
- $elem = $this->vcal->createProperty('DTSTART');
- $elem->setDateTime($dt);
-
- $this->assertEquals('19850704T013000', (string)$elem);
- $this->assertEquals('Europe/Amsterdam', (string)$elem['TZID']);
- $this->assertNull($elem['VALUE']);
-
- $this->assertTrue($elem->hasTime());
-
- }
-
- function testSetDateTimeLOCAL() {
-
- $tz = new \DateTimeZone('Europe/Amsterdam');
- $dt = new \DateTime('1985-07-04 01:30:00', $tz);
- $dt->setTimeZone($tz);
-
- $elem = $this->vcal->createProperty('DTSTART');
- $elem->setDateTime($dt, $isFloating = true);
-
- $this->assertEquals('19850704T013000', (string)$elem);
- $this->assertNull($elem['TZID']);
-
- $this->assertTrue($elem->hasTime());
- }
-
- function testSetDateTimeUTC() {
-
- $tz = new \DateTimeZone('GMT');
- $dt = new \DateTime('1985-07-04 01:30:00', $tz);
- $dt->setTimeZone($tz);
-
- $elem = $this->vcal->createProperty('DTSTART');
- $elem->setDateTime($dt);
-
- $this->assertEquals('19850704T013000Z', (string)$elem);
- $this->assertNull($elem['TZID']);
-
- $this->assertTrue($elem->hasTime());
- }
-
- function testSetDateTimeFromUnixTimestamp() {
-
- // When initialized from a Unix timestamp, the timezone is set to "+00:00".
- $dt = new \DateTime('@489288600');
-
- $elem = $this->vcal->createProperty('DTSTART');
- $elem->setDateTime($dt);
-
- $this->assertEquals('19850704T013000Z', (string)$elem);
- $this->assertNull($elem['TZID']);
-
- $this->assertTrue($elem->hasTime());
- }
-
- function testSetDateTimeLOCALTZ() {
-
- $tz = new \DateTimeZone('Europe/Amsterdam');
- $dt = new \DateTime('1985-07-04 01:30:00', $tz);
- $dt->setTimeZone($tz);
-
- $elem = $this->vcal->createProperty('DTSTART');
- $elem->setDateTime($dt);
-
- $this->assertEquals('19850704T013000', (string)$elem);
- $this->assertEquals('Europe/Amsterdam', (string)$elem['TZID']);
-
- $this->assertTrue($elem->hasTime());
- }
-
- function testSetDateTimeDATE() {
-
- $tz = new \DateTimeZone('Europe/Amsterdam');
- $dt = new \DateTime('1985-07-04 01:30:00', $tz);
- $dt->setTimeZone($tz);
-
- $elem = $this->vcal->createProperty('DTSTART');
- $elem['VALUE'] = 'DATE';
- $elem->setDateTime($dt);
-
- $this->assertEquals('19850704', (string)$elem);
- $this->assertNull($elem['TZID']);
- $this->assertEquals('DATE', (string)$elem['VALUE']);
-
- $this->assertFalse($elem->hasTime());
- }
-
- function testSetValue() {
-
- $tz = new \DateTimeZone('Europe/Amsterdam');
- $dt = new \DateTime('1985-07-04 01:30:00', $tz);
- $dt->setTimeZone($tz);
-
- $elem = $this->vcal->createProperty('DTSTART');
- $elem->setValue($dt);
-
- $this->assertEquals('19850704T013000', (string)$elem);
- $this->assertEquals('Europe/Amsterdam', (string)$elem['TZID']);
- $this->assertNull($elem['VALUE']);
-
- $this->assertTrue($elem->hasTime());
-
- }
-
- function testSetValueArray() {
-
- $tz = new \DateTimeZone('Europe/Amsterdam');
- $dt1 = new \DateTime('1985-07-04 01:30:00', $tz);
- $dt2 = new \DateTime('1985-07-04 02:30:00', $tz);
- $dt1->setTimeZone($tz);
- $dt2->setTimeZone($tz);
-
- $elem = $this->vcal->createProperty('DTSTART');
- $elem->setValue([$dt1, $dt2]);
-
- $this->assertEquals('19850704T013000,19850704T023000', (string)$elem);
- $this->assertEquals('Europe/Amsterdam', (string)$elem['TZID']);
- $this->assertNull($elem['VALUE']);
-
- $this->assertTrue($elem->hasTime());
-
- }
-
- function testSetParts() {
-
- $tz = new \DateTimeZone('Europe/Amsterdam');
- $dt1 = new \DateTime('1985-07-04 01:30:00', $tz);
- $dt2 = new \DateTime('1985-07-04 02:30:00', $tz);
- $dt1->setTimeZone($tz);
- $dt2->setTimeZone($tz);
-
- $elem = $this->vcal->createProperty('DTSTART');
- $elem->setParts([$dt1, $dt2]);
-
- $this->assertEquals('19850704T013000,19850704T023000', (string)$elem);
- $this->assertEquals('Europe/Amsterdam', (string)$elem['TZID']);
- $this->assertNull($elem['VALUE']);
-
- $this->assertTrue($elem->hasTime());
-
- }
- function testSetPartsStrings() {
-
- $dt1 = '19850704T013000Z';
- $dt2 = '19850704T023000Z';
-
- $elem = $this->vcal->createProperty('DTSTART');
- $elem->setParts([$dt1, $dt2]);
-
- $this->assertEquals('19850704T013000Z,19850704T023000Z', (string)$elem);
- $this->assertNull($elem['VALUE']);
-
- $this->assertTrue($elem->hasTime());
-
- }
-
-
- function testGetDateTimeCached() {
-
- $tz = new \DateTimeZone('Europe/Amsterdam');
- $dt = new \DateTimeImmutable('1985-07-04 01:30:00', $tz);
- $dt->setTimeZone($tz);
-
- $elem = $this->vcal->createProperty('DTSTART');
- $elem->setDateTime($dt);
-
- $this->assertEquals($elem->getDateTime(), $dt);
-
- }
-
- function testGetDateTimeDateNULL() {
-
- $elem = $this->vcal->createProperty('DTSTART');
- $dt = $elem->getDateTime();
-
- $this->assertNull($dt);
-
- }
-
- function testGetDateTimeDateDATE() {
-
- $elem = $this->vcal->createProperty('DTSTART', '19850704');
- $dt = $elem->getDateTime();
-
- $this->assertInstanceOf('DateTimeImmutable', $dt);
- $this->assertEquals('1985-07-04 00:00:00', $dt->format('Y-m-d H:i:s'));
-
- }
-
- function testGetDateTimeDateDATEReferenceTimeZone() {
-
- $elem = $this->vcal->createProperty('DTSTART', '19850704');
-
- $tz = new \DateTimeZone('America/Toronto');
- $dt = $elem->getDateTime($tz);
- $dt = $dt->setTimeZone(new \DateTimeZone('UTC'));
-
- $this->assertInstanceOf('DateTimeImmutable', $dt);
- $this->assertEquals('1985-07-04 04:00:00', $dt->format('Y-m-d H:i:s'));
-
- }
-
- function testGetDateTimeDateFloating() {
-
- $elem = $this->vcal->createProperty('DTSTART', '19850704T013000');
- $dt = $elem->getDateTime();
-
- $this->assertInstanceOf('DateTimeImmutable', $dt);
- $this->assertEquals('1985-07-04 01:30:00', $dt->format('Y-m-d H:i:s'));
-
- }
-
- function testGetDateTimeDateFloatingReferenceTimeZone() {
-
- $elem = $this->vcal->createProperty('DTSTART', '19850704T013000');
-
- $tz = new \DateTimeZone('America/Toronto');
- $dt = $elem->getDateTime($tz);
- $dt = $dt->setTimeZone(new \DateTimeZone('UTC'));
-
- $this->assertInstanceOf('DateTimeInterface', $dt);
- $this->assertEquals('1985-07-04 05:30:00', $dt->format('Y-m-d H:i:s'));
-
- }
-
- function testGetDateTimeDateUTC() {
-
- $elem = $this->vcal->createProperty('DTSTART', '19850704T013000Z');
- $dt = $elem->getDateTime();
-
- $this->assertInstanceOf('DateTimeImmutable', $dt);
- $this->assertEquals('1985-07-04 01:30:00', $dt->format('Y-m-d H:i:s'));
- $this->assertEquals('UTC', $dt->getTimeZone()->getName());
-
- }
-
- function testGetDateTimeDateLOCALTZ() {
-
- $elem = $this->vcal->createProperty('DTSTART', '19850704T013000');
- $elem['TZID'] = 'Europe/Amsterdam';
-
- $dt = $elem->getDateTime();
-
- $this->assertInstanceOf('DateTimeImmutable', $dt);
- $this->assertEquals('1985-07-04 01:30:00', $dt->format('Y-m-d H:i:s'));
- $this->assertEquals('Europe/Amsterdam', $dt->getTimeZone()->getName());
-
- }
-
- /**
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testGetDateTimeDateInvalid() {
-
- $elem = $this->vcal->createProperty('DTSTART', 'bla');
- $dt = $elem->getDateTime();
-
- }
-
- function testGetDateTimeWeirdTZ() {
-
- $elem = $this->vcal->createProperty('DTSTART', '19850704T013000');
- $elem['TZID'] = '/freeassociation.sourceforge.net/Tzfile/Europe/Amsterdam';
-
-
- $event = $this->vcal->createComponent('VEVENT');
- $event->add($elem);
-
- $timezone = $this->vcal->createComponent('VTIMEZONE');
- $timezone->TZID = '/freeassociation.sourceforge.net/Tzfile/Europe/Amsterdam';
- $timezone->{'X-LIC-LOCATION'} = 'Europe/Amsterdam';
-
- $this->vcal->add($event);
- $this->vcal->add($timezone);
-
- $dt = $elem->getDateTime();
-
- $this->assertInstanceOf('DateTimeImmutable', $dt);
- $this->assertEquals('1985-07-04 01:30:00', $dt->format('Y-m-d H:i:s'));
- $this->assertEquals('Europe/Amsterdam', $dt->getTimeZone()->getName());
-
- }
-
- function testGetDateTimeBadTimeZone() {
-
- $default = date_default_timezone_get();
- date_default_timezone_set('Canada/Eastern');
-
- $elem = $this->vcal->createProperty('DTSTART', '19850704T013000');
- $elem['TZID'] = 'Moon';
-
-
- $event = $this->vcal->createComponent('VEVENT');
- $event->add($elem);
-
- $timezone = $this->vcal->createComponent('VTIMEZONE');
- $timezone->TZID = 'Moon';
- $timezone->{'X-LIC-LOCATION'} = 'Moon';
-
-
- $this->vcal->add($event);
- $this->vcal->add($timezone);
-
- $dt = $elem->getDateTime();
-
- $this->assertInstanceOf('DateTimeImmutable', $dt);
- $this->assertEquals('1985-07-04 01:30:00', $dt->format('Y-m-d H:i:s'));
- $this->assertEquals('Canada/Eastern', $dt->getTimeZone()->getName());
- date_default_timezone_set($default);
-
- }
-
- function testUpdateValueParameter() {
-
- $dtStart = $this->vcal->createProperty('DTSTART', new \DateTime('2013-06-07 15:05:00'));
- $dtStart['VALUE'] = 'DATE';
-
- $this->assertEquals("DTSTART;VALUE=DATE:20130607\r\n", $dtStart->serialize());
-
- }
-
- function testValidate() {
-
- $exDate = $this->vcal->createProperty('EXDATE', '-00011130T143000Z');
- $messages = $exDate->validate();
- $this->assertEquals(1, count($messages));
- $this->assertEquals(3, $messages[0]['level']);
-
- }
-
- /**
- * This issue was discovered on the sabredav mailing list.
- */
- function testCreateDatePropertyThroughAdd() {
-
- $vcal = new VCalendar();
- $vevent = $vcal->add('VEVENT');
-
- $dtstart = $vevent->add(
- 'DTSTART',
- new \DateTime('2014-03-07'),
- ['VALUE' => 'DATE']
- );
-
- $this->assertEquals("DTSTART;VALUE=DATE:20140307\r\n", $dtstart->serialize());
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/ICalendar/DurationTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/ICalendar/DurationTest.php
deleted file mode 100644
index 9aaaebce0a0..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/ICalendar/DurationTest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-add('VEVENT', ['DURATION' => ['PT1H']]);
-
- $this->assertEquals(
- new \DateInterval('PT1H'),
- $event->{'DURATION'}->getDateInterval()
- );
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/ICalendar/RecurTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/ICalendar/RecurTest.php
deleted file mode 100644
index df95e3bc849..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/ICalendar/RecurTest.php
+++ /dev/null
@@ -1,453 +0,0 @@
-add('RRULE', 'FREQ=Daily');
-
- $this->assertInstanceOf('Sabre\VObject\Property\ICalendar\Recur', $recur);
-
- $this->assertEquals(['FREQ' => 'DAILY'], $recur->getParts());
- $recur->setParts(['freq' => 'MONTHLY']);
-
- $this->assertEquals(['FREQ' => 'MONTHLY'], $recur->getParts());
-
- }
-
- /**
- * @expectedException \InvalidArgumentException
- */
- function testSetValueBadVal() {
-
- $vcal = new VCalendar();
- $recur = $vcal->add('RRULE', 'FREQ=Daily');
- $recur->setValue(new \Exception());
-
- }
-
- function testSetValueWithCount() {
- $vcal = new VCalendar();
- $recur = $vcal->add('RRULE', 'FREQ=Daily');
- $recur->setValue(['COUNT' => 3]);
- $this->assertEquals($recur->getParts()['COUNT'], 3);
- }
-
- function testGetJSONWithCount() {
- $input = 'BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:908d53c0-e1a3-4883-b69f-530954d6bd62
-TRANSP:OPAQUE
-DTSTART;TZID=Europe/Berlin:20160301T150000
-DTEND;TZID=Europe/Berlin:20160301T170000
-SUMMARY:test
-RRULE:FREQ=DAILY;COUNT=3
-ORGANIZER;CN=robert pipo:mailto:robert@example.org
-END:VEVENT
-END:VCALENDAR
-';
-
- $vcal = Reader::read($input);
- $rrule = $vcal->VEVENT->RRULE;
- $count = $rrule->getJsonValue()[0]['count'];
- $this->assertTrue(is_int($count));
- $this->assertEquals(3, $count);
- }
-
- function testSetSubParts() {
-
- $vcal = new VCalendar();
- $recur = $vcal->add('RRULE', ['FREQ' => 'DAILY', 'BYDAY' => 'mo,tu', 'BYMONTH' => [0, 1]]);
-
- $this->assertEquals([
- 'FREQ' => 'DAILY',
- 'BYDAY' => ['MO', 'TU'],
- 'BYMONTH' => [0, 1],
- ], $recur->getParts());
-
- }
-
- function testGetJSONWithUntil() {
- $input = 'BEGIN:VCALENDAR
-BEGIN:VEVENT
-UID:908d53c0-e1a3-4883-b69f-530954d6bd62
-TRANSP:OPAQUE
-DTSTART;TZID=Europe/Berlin:20160301T150000
-DTEND;TZID=Europe/Berlin:20160301T170000
-SUMMARY:test
-RRULE:FREQ=DAILY;UNTIL=20160305T230000Z
-ORGANIZER;CN=robert pipo:mailto:robert@example.org
-END:VEVENT
-END:VCALENDAR
-';
-
- $vcal = Reader::read($input);
- $rrule = $vcal->VEVENT->RRULE;
- $untilJsonString = $rrule->getJsonValue()[0]['until'];
- $this->assertEquals('2016-03-05T23:00:00Z', $untilJsonString);
- }
-
-
- function testValidateStripEmpties() {
-
- $input = 'BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:foobar
-BEGIN:VEVENT
-UID:908d53c0-e1a3-4883-b69f-530954d6bd62
-TRANSP:OPAQUE
-DTSTART;TZID=Europe/Berlin:20160301T150000
-DTEND;TZID=Europe/Berlin:20160301T170000
-SUMMARY:test
-RRULE:FREQ=DAILY;BYMONTH=;UNTIL=20160305T230000Z
-ORGANIZER;CN=robert pipo:mailto:robert@example.org
-DTSTAMP:20160312T183800Z
-END:VEVENT
-END:VCALENDAR
-';
-
- $vcal = Reader::read($input);
- $this->assertEquals(
- 1,
- count($vcal->validate())
- );
- $this->assertEquals(
- 1,
- count($vcal->validate($vcal::REPAIR))
- );
-
- $expected = 'BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:foobar
-BEGIN:VEVENT
-UID:908d53c0-e1a3-4883-b69f-530954d6bd62
-TRANSP:OPAQUE
-DTSTART;TZID=Europe/Berlin:20160301T150000
-DTEND;TZID=Europe/Berlin:20160301T170000
-SUMMARY:test
-RRULE:FREQ=DAILY;UNTIL=20160305T230000Z
-ORGANIZER;CN=robert pipo:mailto:robert@example.org
-DTSTAMP:20160312T183800Z
-END:VEVENT
-END:VCALENDAR
-';
-
- $this->assertVObjectEqualsVObject(
- $expected,
- $vcal
- );
-
- }
-
- function testValidateStripNoFreq() {
-
- $input = 'BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:foobar
-BEGIN:VEVENT
-UID:908d53c0-e1a3-4883-b69f-530954d6bd62
-TRANSP:OPAQUE
-DTSTART;TZID=Europe/Berlin:20160301T150000
-DTEND;TZID=Europe/Berlin:20160301T170000
-SUMMARY:test
-RRULE:UNTIL=20160305T230000Z
-ORGANIZER;CN=robert pipo:mailto:robert@example.org
-DTSTAMP:20160312T183800Z
-END:VEVENT
-END:VCALENDAR
-';
-
- $vcal = Reader::read($input);
- $this->assertEquals(
- 1,
- count($vcal->validate())
- );
- $this->assertEquals(
- 1,
- count($vcal->validate($vcal::REPAIR))
- );
-
- $expected = 'BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:foobar
-BEGIN:VEVENT
-UID:908d53c0-e1a3-4883-b69f-530954d6bd62
-TRANSP:OPAQUE
-DTSTART;TZID=Europe/Berlin:20160301T150000
-DTEND;TZID=Europe/Berlin:20160301T170000
-SUMMARY:test
-ORGANIZER;CN=robert pipo:mailto:robert@example.org
-DTSTAMP:20160312T183800Z
-END:VEVENT
-END:VCALENDAR
-';
-
- $this->assertVObjectEqualsVObject(
- $expected,
- $vcal
- );
-
- }
-
- function testValidateInvalidByMonthRruleWithRepair() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('RRULE', 'FREQ=YEARLY;COUNT=6;BYMONTHDAY=24;BYMONTH=0');
- $result = $property->validate(Node::REPAIR);
-
- $this->assertCount(1, $result);
- $this->assertEquals('BYMONTH in RRULE must have value(s) between 1 and 12!', $result[0]['message']);
- $this->assertEquals(1, $result[0]['level']);
- $this->assertEquals('FREQ=YEARLY;COUNT=6;BYMONTHDAY=24', $property->getValue());
-
- }
-
- function testValidateInvalidByMonthRruleWithoutRepair() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('RRULE', 'FREQ=YEARLY;COUNT=6;BYMONTHDAY=24;BYMONTH=0');
- $result = $property->validate();
-
- $this->assertCount(1, $result);
- $this->assertEquals('BYMONTH in RRULE must have value(s) between 1 and 12!', $result[0]['message']);
- $this->assertEquals(3, $result[0]['level']);
- $this->assertEquals('FREQ=YEARLY;COUNT=6;BYMONTHDAY=24;BYMONTH=0', $property->getValue());
-
- }
-
- function testValidateInvalidByMonthRruleWithRepair2() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('RRULE', 'FREQ=YEARLY;COUNT=6;BYMONTHDAY=24;BYMONTH=bla');
- $result = $property->validate(Node::REPAIR);
-
- $this->assertCount(1, $result);
- $this->assertEquals('BYMONTH in RRULE must have value(s) between 1 and 12!', $result[0]['message']);
- $this->assertEquals(1, $result[0]['level']);
- $this->assertEquals('FREQ=YEARLY;COUNT=6;BYMONTHDAY=24', $property->getValue());
-
- }
-
- function testValidateInvalidByMonthRruleWithoutRepair2() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('RRULE', 'FREQ=YEARLY;COUNT=6;BYMONTHDAY=24;BYMONTH=bla');
- $result = $property->validate();
-
- $this->assertCount(1, $result);
- $this->assertEquals('BYMONTH in RRULE must have value(s) between 1 and 12!', $result[0]['message']);
- $this->assertEquals(3, $result[0]['level']);
- // Without repair the invalid BYMONTH is still there, but the value is changed to uppercase
- $this->assertEquals('FREQ=YEARLY;COUNT=6;BYMONTHDAY=24;BYMONTH=BLA', $property->getValue());
-
- }
-
- function testValidateInvalidByMonthRruleValue14WithRepair() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('RRULE', 'FREQ=YEARLY;COUNT=6;BYMONTHDAY=24;BYMONTH=14');
- $result = $property->validate(Node::REPAIR);
-
- $this->assertCount(1, $result);
- $this->assertEquals('BYMONTH in RRULE must have value(s) between 1 and 12!', $result[0]['message']);
- $this->assertEquals(1, $result[0]['level']);
- $this->assertEquals('FREQ=YEARLY;COUNT=6;BYMONTHDAY=24', $property->getValue());
-
- }
-
- function testValidateInvalidByMonthRruleMultipleWithRepair() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('RRULE', 'FREQ=YEARLY;COUNT=6;BYMONTHDAY=24;BYMONTH=0,1,2,3,4,14');
- $result = $property->validate(Node::REPAIR);
-
- $this->assertCount(2, $result);
- $this->assertEquals('BYMONTH in RRULE must have value(s) between 1 and 12!', $result[0]['message']);
- $this->assertEquals(1, $result[0]['level']);
- $this->assertEquals('BYMONTH in RRULE must have value(s) between 1 and 12!', $result[1]['message']);
- $this->assertEquals(1, $result[1]['level']);
- $this->assertEquals('FREQ=YEARLY;COUNT=6;BYMONTHDAY=24;BYMONTH=1,2,3,4', $property->getValue());
-
- }
-
- function testValidateOneOfManyInvalidByMonthRruleWithRepair() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('RRULE', 'FREQ=YEARLY;COUNT=6;BYMONTHDAY=24;BYMONTH=bla,3,foo');
- $result = $property->validate(Node::REPAIR);
-
- $this->assertCount(2, $result);
- $this->assertEquals('BYMONTH in RRULE must have value(s) between 1 and 12!', $result[0]['message']);
- $this->assertEquals(1, $result[0]['level']);
- $this->assertEquals('BYMONTH in RRULE must have value(s) between 1 and 12!', $result[1]['message']);
- $this->assertEquals(1, $result[1]['level']);
- $this->assertEquals('FREQ=YEARLY;COUNT=6;BYMONTHDAY=24;BYMONTH=3', $property->getValue());
-
- }
-
- function testValidateValidByMonthRrule() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('RRULE', 'FREQ=YEARLY;COUNT=6;BYMONTHDAY=24;BYMONTH=2,3');
- $this->assertEquals('FREQ=YEARLY;COUNT=6;BYMONTHDAY=24;BYMONTH=2,3', $property->getValue());
-
- }
-
- /**
- * test for issue #336
- */
- function testValidateRruleBySecondZero() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('RRULE', 'FREQ=DAILY;BYHOUR=10;BYMINUTE=30;BYSECOND=0;UNTIL=20150616T153000Z');
- $result = $property->validate(Node::REPAIR);
-
- // There should be 0 warnings and the value should be unchanged
- $this->assertEmpty($result);
- $this->assertEquals('FREQ=DAILY;BYHOUR=10;BYMINUTE=30;BYSECOND=0;UNTIL=20150616T153000Z', $property->getValue());
-
- }
-
- function testValidateValidByWeekNoWithRepair() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('RRULE', 'FREQ=YEARLY;COUNT=6;BYWEEKNO=11');
- $result = $property->validate(Node::REPAIR);
-
- $this->assertCount(0, $result);
- $this->assertEquals('FREQ=YEARLY;COUNT=6;BYWEEKNO=11', $property->getValue());
-
- }
-
- function testValidateInvalidByWeekNoWithRepair() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('RRULE', 'FREQ=YEARLY;COUNT=6;BYWEEKNO=55;BYDAY=WE');
- $result = $property->validate(Node::REPAIR);
-
- $this->assertCount(1, $result);
- $this->assertEquals('BYWEEKNO in RRULE must have value(s) from -53 to -1, or 1 to 53!', $result[0]['message']);
- $this->assertEquals(1, $result[0]['level']);
- $this->assertEquals('FREQ=YEARLY;COUNT=6;BYDAY=WE', $property->getValue());
-
- }
-
- function testValidateMultipleInvalidByWeekNoWithRepair() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('RRULE', 'FREQ=YEARLY;COUNT=6;BYWEEKNO=55,2,-80;BYDAY=WE');
- $result = $property->validate(Node::REPAIR);
-
- $this->assertCount(2, $result);
- $this->assertEquals('BYWEEKNO in RRULE must have value(s) from -53 to -1, or 1 to 53!', $result[0]['message']);
- $this->assertEquals(1, $result[0]['level']);
- $this->assertEquals('BYWEEKNO in RRULE must have value(s) from -53 to -1, or 1 to 53!', $result[1]['message']);
- $this->assertEquals(1, $result[1]['level']);
- $this->assertEquals('FREQ=YEARLY;COUNT=6;BYWEEKNO=2;BYDAY=WE', $property->getValue());
-
- }
-
- function testValidateAllInvalidByWeekNoWithRepair() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('RRULE', 'FREQ=YEARLY;COUNT=6;BYWEEKNO=55,-80;BYDAY=WE');
- $result = $property->validate(Node::REPAIR);
-
- $this->assertCount(2, $result);
- $this->assertEquals('BYWEEKNO in RRULE must have value(s) from -53 to -1, or 1 to 53!', $result[0]['message']);
- $this->assertEquals(1, $result[0]['level']);
- $this->assertEquals('BYWEEKNO in RRULE must have value(s) from -53 to -1, or 1 to 53!', $result[1]['message']);
- $this->assertEquals(1, $result[1]['level']);
- $this->assertEquals('FREQ=YEARLY;COUNT=6;BYDAY=WE', $property->getValue());
-
- }
-
- function testValidateInvalidByWeekNoWithoutRepair() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('RRULE', 'FREQ=YEARLY;COUNT=6;BYWEEKNO=55;BYDAY=WE');
- $result = $property->validate();
-
- $this->assertCount(1, $result);
- $this->assertEquals('BYWEEKNO in RRULE must have value(s) from -53 to -1, or 1 to 53!', $result[0]['message']);
- $this->assertEquals(3, $result[0]['level']);
- $this->assertEquals('FREQ=YEARLY;COUNT=6;BYWEEKNO=55;BYDAY=WE', $property->getValue());
-
- }
-
- function testValidateValidByYearDayWithRepair() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('RRULE', 'FREQ=YEARLY;COUNT=6;BYYEARDAY=119');
- $result = $property->validate(Node::REPAIR);
-
- $this->assertCount(0, $result);
- $this->assertEquals('FREQ=YEARLY;COUNT=6;BYYEARDAY=119', $property->getValue());
-
- }
-
- function testValidateInvalidByYearDayWithRepair() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('RRULE', 'FREQ=YEARLY;COUNT=6;BYYEARDAY=367;BYDAY=WE');
- $result = $property->validate(Node::REPAIR);
-
- $this->assertCount(1, $result);
- $this->assertEquals('BYYEARDAY in RRULE must have value(s) from -366 to -1, or 1 to 366!', $result[0]['message']);
- $this->assertEquals(1, $result[0]['level']);
- $this->assertEquals('FREQ=YEARLY;COUNT=6;BYDAY=WE', $property->getValue());
-
- }
-
- function testValidateMultipleInvalidByYearDayWithRepair() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('RRULE', 'FREQ=YEARLY;COUNT=6;BYYEARDAY=380,2,-390;BYDAY=WE');
- $result = $property->validate(Node::REPAIR);
-
- $this->assertCount(2, $result);
- $this->assertEquals('BYYEARDAY in RRULE must have value(s) from -366 to -1, or 1 to 366!', $result[0]['message']);
- $this->assertEquals(1, $result[0]['level']);
- $this->assertEquals('BYYEARDAY in RRULE must have value(s) from -366 to -1, or 1 to 366!', $result[1]['message']);
- $this->assertEquals(1, $result[1]['level']);
- $this->assertEquals('FREQ=YEARLY;COUNT=6;BYYEARDAY=2;BYDAY=WE', $property->getValue());
-
- }
-
- function testValidateAllInvalidByYearDayWithRepair() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('RRULE', 'FREQ=YEARLY;COUNT=6;BYYEARDAY=455,-480;BYDAY=WE');
- $result = $property->validate(Node::REPAIR);
-
- $this->assertCount(2, $result);
- $this->assertEquals('BYYEARDAY in RRULE must have value(s) from -366 to -1, or 1 to 366!', $result[0]['message']);
- $this->assertEquals(1, $result[0]['level']);
- $this->assertEquals('BYYEARDAY in RRULE must have value(s) from -366 to -1, or 1 to 366!', $result[1]['message']);
- $this->assertEquals(1, $result[1]['level']);
- $this->assertEquals('FREQ=YEARLY;COUNT=6;BYDAY=WE', $property->getValue());
-
- }
-
- function testValidateInvalidByYearDayWithoutRepair() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('RRULE', 'FREQ=YEARLY;COUNT=6;BYYEARDAY=380;BYDAY=WE');
- $result = $property->validate();
-
- $this->assertCount(1, $result);
- $this->assertEquals('BYYEARDAY in RRULE must have value(s) from -366 to -1, or 1 to 366!', $result[0]['message']);
- $this->assertEquals(3, $result[0]['level']);
- $this->assertEquals('FREQ=YEARLY;COUNT=6;BYYEARDAY=380;BYDAY=WE', $property->getValue());
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/TextTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/TextTest.php
deleted file mode 100644
index 69ac8aaf181..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/TextTest.php
+++ /dev/null
@@ -1,96 +0,0 @@
- '2.1',
- 'PROP' => $propValue
- ], false);
-
- // Adding quoted-printable, because we're testing if it gets removed
- // automatically.
- $doc->PROP['ENCODING'] = 'QUOTED-PRINTABLE';
- $doc->PROP['P1'] = 'V1';
-
-
- $output = $doc->serialize();
-
-
- $this->assertEquals("BEGIN:VCARD\r\nVERSION:2.1\r\n$expected\r\nEND:VCARD\r\n", $output);
-
- }
-
- function testSerializeVCard21() {
-
- $this->assertVCard21Serialization(
- 'f;oo',
- 'PROP;P1=V1:f;oo'
- );
-
- }
-
- function testSerializeVCard21Array() {
-
- $this->assertVCard21Serialization(
- ['f;oo', 'bar'],
- 'PROP;P1=V1:f\;oo;bar'
- );
-
- }
- function testSerializeVCard21Fold() {
-
- $this->assertVCard21Serialization(
- str_repeat('x', 80),
- 'PROP;P1=V1:' . str_repeat('x', 64) . "\r\n " . str_repeat('x', 16)
- );
-
- }
-
-
-
- function testSerializeQuotedPrintable() {
-
- $this->assertVCard21Serialization(
- "foo\r\nbar",
- 'PROP;P1=V1;ENCODING=QUOTED-PRINTABLE:foo=0D=0Abar'
- );
- }
-
- function testSerializeQuotedPrintableFold() {
-
- $this->assertVCard21Serialization(
- "foo\r\nbarxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
- "PROP;P1=V1;ENCODING=QUOTED-PRINTABLE:foo=0D=0Abarxxxxxxxxxxxxxxxxxxxxxxxxxx=\r\n xxx"
- );
-
- }
-
- function testValidateMinimumPropValue() {
-
- $vcard = <<assertEquals(1, count($vcard->validate()));
-
- $this->assertEquals(1, count($vcard->N->getParts()));
-
- $vcard->validate(\Sabre\VObject\Node::REPAIR);
-
- $this->assertEquals(5, count($vcard->N->getParts()));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/UriTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/UriTest.php
deleted file mode 100644
index 2c44d8888a4..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/UriTest.php
+++ /dev/null
@@ -1,27 +0,0 @@
-serialize();
- $this->assertContains('URL;VALUE=URI:http://example.org/', $output);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/VCard/DateAndOrTimeTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/VCard/DateAndOrTimeTest.php
deleted file mode 100644
index 7bc2c67a9e8..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/VCard/DateAndOrTimeTest.php
+++ /dev/null
@@ -1,269 +0,0 @@
-createProperty('BDAY', $input);
-
- $this->assertEquals([$output], $prop->getJsonValue());
-
- }
-
- function dates() {
-
- return [
- [
- "19961022T140000",
- "1996-10-22T14:00:00",
- ],
- [
- "--1022T1400",
- "--10-22T14:00",
- ],
- [
- "---22T14",
- "---22T14",
- ],
- [
- "19850412",
- "1985-04-12",
- ],
- [
- "1985-04",
- "1985-04",
- ],
- [
- "1985",
- "1985",
- ],
- [
- "--0412",
- "--04-12",
- ],
- [
- "T102200",
- "T10:22:00",
- ],
- [
- "T1022",
- "T10:22",
- ],
- [
- "T10",
- "T10",
- ],
- [
- "T-2200",
- "T-22:00",
- ],
- [
- "T102200Z",
- "T10:22:00Z",
- ],
- [
- "T102200-0800",
- "T10:22:00-0800",
- ],
- [
- "T--00",
- "T--00",
- ],
- ];
-
- }
-
- function testSetParts() {
-
- $vcard = new VObject\Component\VCard();
-
- $prop = $vcard->createProperty('BDAY');
- $prop->setParts([
- new \DateTime('2014-04-02 18:37:00')
- ]);
-
- $this->assertEquals('20140402T183700Z', $prop->getValue());
-
- }
-
- function testSetPartsDateTimeImmutable() {
-
- $vcard = new VObject\Component\VCard();
-
- $prop = $vcard->createProperty('BDAY');
- $prop->setParts([
- new \DateTimeImmutable('2014-04-02 18:37:00')
- ]);
-
- $this->assertEquals('20140402T183700Z', $prop->getValue());
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testSetPartsTooMany() {
-
- $vcard = new VObject\Component\VCard();
-
- $prop = $vcard->createProperty('BDAY');
- $prop->setParts([
- 1,
- 2
- ]);
-
- }
-
- function testSetPartsString() {
-
- $vcard = new VObject\Component\VCard();
-
- $prop = $vcard->createProperty('BDAY');
- $prop->setParts([
- "20140402T183700Z"
- ]);
-
- $this->assertEquals('20140402T183700Z', $prop->getValue());
-
- }
-
- function testSetValueDateTime() {
-
- $vcard = new VObject\Component\VCard();
-
- $prop = $vcard->createProperty('BDAY');
- $prop->setValue(
- new \DateTime('2014-04-02 18:37:00')
- );
-
- $this->assertEquals('20140402T183700Z', $prop->getValue());
-
- }
-
- function testSetValueDateTimeImmutable() {
-
- $vcard = new VObject\Component\VCard();
-
- $prop = $vcard->createProperty('BDAY');
- $prop->setValue(
- new \DateTimeImmutable('2014-04-02 18:37:00')
- );
-
- $this->assertEquals('20140402T183700Z', $prop->getValue());
-
- }
-
- function testSetDateTimeOffset() {
-
- $vcard = new VObject\Component\VCard();
-
- $prop = $vcard->createProperty('BDAY');
- $prop->setValue(
- new \DateTime('2014-04-02 18:37:00', new \DateTimeZone('America/Toronto'))
- );
-
- $this->assertEquals('20140402T183700-0400', $prop->getValue());
-
- }
-
- function testGetDateTime() {
-
- $datetime = new \DateTime('2014-04-02 18:37:00', new \DateTimeZone('America/Toronto'));
-
- $vcard = new VObject\Component\VCard();
- $prop = $vcard->createProperty('BDAY', $datetime);
-
- $dt = $prop->getDateTime();
- $this->assertEquals('2014-04-02T18:37:00-04:00', $dt->format('c'), "For some reason this one failed. Current default timezone is: " . date_default_timezone_get());
-
- }
-
- function testGetDate() {
-
- $datetime = new \DateTime('2014-04-02');
-
- $vcard = new VObject\Component\VCard();
- $prop = $vcard->createProperty('BDAY', $datetime, null, 'DATE');
-
- $this->assertEquals('DATE', $prop->getValueType());
- $this->assertEquals('BDAY:20140402', rtrim($prop->serialize()));
-
- }
-
- function testGetDateIncomplete() {
-
- $datetime = '--0407';
-
- $vcard = new VObject\Component\VCard();
- $prop = $vcard->add('BDAY', $datetime);
-
- $dt = $prop->getDateTime();
- // Note: if the year changes between the last line and the next line of
- // code, this test may fail.
- //
- // If that happens, head outside and have a drink.
- $current = new \DateTime('now');
- $year = $current->format('Y');
-
- $this->assertEquals($year . '0407', $dt->format('Ymd'));
-
- }
-
- function testGetDateIncompleteFromVCard() {
-
- $vcard = <<BDAY;
-
- $dt = $prop->getDateTime();
- // Note: if the year changes between the last line and the next line of
- // code, this test may fail.
- //
- // If that happens, head outside and have a drink.
- $current = new \DateTime('now');
- $year = $current->format('Y');
-
- $this->assertEquals($year . '0407', $dt->format('Ymd'));
-
- }
-
- function testValidate() {
-
- $datetime = '--0407';
-
- $vcard = new VObject\Component\VCard();
- $prop = $vcard->add('BDAY', $datetime);
-
- $this->assertEquals([], $prop->validate());
-
- }
-
- function testValidateBroken() {
-
- $datetime = '123';
-
- $vcard = new VObject\Component\VCard();
- $prop = $vcard->add('BDAY', $datetime);
-
- $this->assertEquals([[
- 'level' => 3,
- 'message' => 'The supplied value (123) is not a correct DATE-AND-OR-TIME property',
- 'node' => $prop,
- ]], $prop->validate());
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/VCard/LanguageTagTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/VCard/LanguageTagTest.php
deleted file mode 100644
index c38b6f26438..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Property/VCard/LanguageTagTest.php
+++ /dev/null
@@ -1,48 +0,0 @@
-parse($input);
-
- $this->assertInstanceOf('Sabre\VObject\Property\VCard\LanguageTag', $result->LANG);
-
- $this->assertEquals('nl', $result->LANG->getValue());
-
- $this->assertEquals(
- $input,
- $result->serialize()
- );
-
- }
-
- function testChangeAndSerialize() {
-
- $input = "BEGIN:VCARD\r\nVERSION:4.0\r\nLANG:nl\r\nEND:VCARD\r\n";
- $mimeDir = new VObject\Parser\MimeDir($input);
-
- $result = $mimeDir->parse($input);
-
- $this->assertInstanceOf('Sabre\VObject\Property\VCard\LanguageTag', $result->LANG);
- // This replicates what the vcard converter does and triggered a bug in
- // the past.
- $result->LANG->setValue(['de']);
-
- $this->assertEquals('de', $result->LANG->getValue());
-
- $expected = "BEGIN:VCARD\r\nVERSION:4.0\r\nLANG:de\r\nEND:VCARD\r\n";
- $this->assertEquals(
- $expected,
- $result->serialize()
- );
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/PropertyTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/PropertyTest.php
deleted file mode 100644
index b6241ce8c02..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/PropertyTest.php
+++ /dev/null
@@ -1,410 +0,0 @@
-createProperty('propname', 'propvalue');
- $this->assertEquals('PROPNAME', $property->name);
- $this->assertEquals('propvalue', $property->__toString());
- $this->assertEquals('propvalue', (string)$property);
- $this->assertEquals('propvalue', $property->getValue());
-
- }
-
- function testCreate() {
-
- $cal = new VCalendar();
-
- $params = [
- 'param1' => 'value1',
- 'param2' => 'value2',
- ];
-
- $property = $cal->createProperty('propname', 'propvalue', $params);
-
- $this->assertEquals('value1', $property['param1']->getValue());
- $this->assertEquals('value2', $property['param2']->getValue());
-
- }
-
- function testSetValue() {
-
- $cal = new VCalendar();
-
- $property = $cal->createProperty('propname', 'propvalue');
- $property->setValue('value2');
-
- $this->assertEquals('PROPNAME', $property->name);
- $this->assertEquals('value2', $property->__toString());
-
- }
-
- function testParameterExists() {
-
- $cal = new VCalendar();
- $property = $cal->createProperty('propname', 'propvalue');
- $property['paramname'] = 'paramvalue';
-
- $this->assertTrue(isset($property['PARAMNAME']));
- $this->assertTrue(isset($property['paramname']));
- $this->assertFalse(isset($property['foo']));
-
- }
-
- function testParameterGet() {
-
- $cal = new VCalendar();
- $property = $cal->createProperty('propname', 'propvalue');
- $property['paramname'] = 'paramvalue';
-
- $this->assertInstanceOf('Sabre\\VObject\\Parameter', $property['paramname']);
-
- }
-
- function testParameterNotExists() {
-
- $cal = new VCalendar();
- $property = $cal->createProperty('propname', 'propvalue');
- $property['paramname'] = 'paramvalue';
-
- $this->assertInternalType('null', $property['foo']);
-
- }
-
- function testParameterMultiple() {
-
- $cal = new VCalendar();
- $property = $cal->createProperty('propname', 'propvalue');
- $property['paramname'] = 'paramvalue';
- $property->add('paramname', 'paramvalue');
-
- $this->assertInstanceOf('Sabre\\VObject\\Parameter', $property['paramname']);
- $this->assertEquals(2, count($property['paramname']->getParts()));
-
- }
-
- function testSetParameterAsString() {
-
- $cal = new VCalendar();
- $property = $cal->createProperty('propname', 'propvalue');
- $property['paramname'] = 'paramvalue';
-
- $this->assertEquals(1, count($property->parameters()));
- $this->assertInstanceOf('Sabre\\VObject\\Parameter', $property->parameters['PARAMNAME']);
- $this->assertEquals('PARAMNAME', $property->parameters['PARAMNAME']->name);
- $this->assertEquals('paramvalue', $property->parameters['PARAMNAME']->getValue());
-
- }
-
- function testUnsetParameter() {
-
- $cal = new VCalendar();
- $property = $cal->createProperty('propname', 'propvalue');
- $property['paramname'] = 'paramvalue';
-
- unset($property['PARAMNAME']);
- $this->assertEquals(0, count($property->parameters()));
-
- }
-
- function testSerialize() {
-
- $cal = new VCalendar();
- $property = $cal->createProperty('propname', 'propvalue');
-
- $this->assertEquals("PROPNAME:propvalue\r\n", $property->serialize());
-
- }
-
- function testSerializeParam() {
-
- $cal = new VCalendar();
- $property = $cal->createProperty('propname', 'propvalue', [
- 'paramname' => 'paramvalue',
- 'paramname2' => 'paramvalue2',
- ]);
-
- $this->assertEquals("PROPNAME;PARAMNAME=paramvalue;PARAMNAME2=paramvalue2:propvalue\r\n", $property->serialize());
-
- }
-
- function testSerializeNewLine() {
-
- $cal = new VCalendar();
- $property = $cal->createProperty('SUMMARY', "line1\nline2");
-
- $this->assertEquals("SUMMARY:line1\\nline2\r\n", $property->serialize());
-
- }
-
- function testSerializeLongLine() {
-
- $cal = new VCalendar();
- $value = str_repeat('!', 200);
- $property = $cal->createProperty('propname', $value);
-
- $expected = "PROPNAME:" . str_repeat('!', 66) . "\r\n " . str_repeat('!', 74) . "\r\n " . str_repeat('!', 60) . "\r\n";
-
- $this->assertEquals($expected, $property->serialize());
-
- }
-
- function testSerializeUTF8LineFold() {
-
- $cal = new VCalendar();
- $value = str_repeat('!', 65) . "\xc3\xa4bla"; // inserted umlaut-a
- $property = $cal->createProperty('propname', $value);
- $expected = "PROPNAME:" . str_repeat('!', 65) . "\r\n \xc3\xa4bla\r\n";
- $this->assertEquals($expected, $property->serialize());
-
- }
-
- function testGetIterator() {
-
- $cal = new VCalendar();
- $it = new ElementList([]);
- $property = $cal->createProperty('propname', 'propvalue');
- $property->setIterator($it);
- $this->assertEquals($it, $property->getIterator());
-
- }
-
-
- function testGetIteratorDefault() {
-
- $cal = new VCalendar();
- $property = $cal->createProperty('propname', 'propvalue');
- $it = $property->getIterator();
- $this->assertTrue($it instanceof ElementList);
- $this->assertEquals(1, count($it));
-
- }
-
- function testAddScalar() {
-
- $cal = new VCalendar();
- $property = $cal->createProperty('EMAIL');
-
- $property->add('myparam', 'value');
-
- $this->assertEquals(1, count($property->parameters()));
-
- $this->assertTrue($property->parameters['MYPARAM'] instanceof Parameter);
- $this->assertEquals('MYPARAM', $property->parameters['MYPARAM']->name);
- $this->assertEquals('value', $property->parameters['MYPARAM']->getValue());
-
- }
-
- function testAddParameter() {
-
- $cal = new VCalendar();
- $prop = $cal->createProperty('EMAIL');
-
- $prop->add('MYPARAM', 'value');
-
- $this->assertEquals(1, count($prop->parameters()));
- $this->assertEquals('MYPARAM', $prop['myparam']->name);
-
- }
-
- function testAddParameterTwice() {
-
- $cal = new VCalendar();
- $prop = $cal->createProperty('EMAIL');
-
- $prop->add('MYPARAM', 'value1');
- $prop->add('MYPARAM', 'value2');
-
- $this->assertEquals(1, count($prop->parameters));
- $this->assertEquals(2, count($prop->parameters['MYPARAM']->getParts()));
-
- $this->assertEquals('MYPARAM', $prop['MYPARAM']->name);
-
- }
-
-
- function testClone() {
-
- $cal = new VCalendar();
- $property = $cal->createProperty('EMAIL', 'value');
- $property['FOO'] = 'BAR';
-
- $property2 = clone $property;
-
- $property['FOO'] = 'BAZ';
- $this->assertEquals('BAR', (string)$property2['FOO']);
-
- }
-
- function testCreateParams() {
-
- $cal = new VCalendar();
- $property = $cal->createProperty('X-PROP', 'value', [
- 'param1' => 'value1',
- 'param2' => ['value2', 'value3']
- ]);
-
- $this->assertEquals(1, count($property['PARAM1']->getParts()));
- $this->assertEquals(2, count($property['PARAM2']->getParts()));
-
- }
-
- function testValidateNonUTF8() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('X-PROP', "Bla\x00");
- $result = $property->validate(Property::REPAIR);
-
- $this->assertEquals('Property contained a control character (0x00)', $result[0]['message']);
- $this->assertEquals('Bla', $property->getValue());
-
- }
-
- function testValidateControlChars() {
-
- $s = "chars[";
- foreach ([
- 0x7F, 0x5E, 0x5C, 0x3B, 0x3A, 0x2C, 0x22, 0x20,
- 0x1F, 0x1E, 0x1D, 0x1C, 0x1B, 0x1A, 0x19, 0x18,
- 0x17, 0x16, 0x15, 0x14, 0x13, 0x12, 0x11, 0x10,
- 0x0F, 0x0E, 0x0D, 0x0C, 0x0B, 0x0A, 0x09, 0x08,
- 0x07, 0x06, 0x05, 0x04, 0x03, 0x02, 0x01, 0x00,
- ] as $c) {
- $s .= sprintf('%02X(%c)', $c, $c);
- }
- $s .= "]end";
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty('X-PROP', $s);
- $result = $property->validate(Property::REPAIR);
-
- $this->assertEquals('Property contained a control character (0x7f)', $result[0]['message']);
- $this->assertEquals("chars[7F()5E(^)5C(\\\\)3B(\\;)3A(:)2C(\\,)22(\")20( )1F()1E()1D()1C()1B()1A()19()18()17()16()15()14()13()12()11()10()0F()0E()0D()0C()0B()0A(\\n)09(\t)08()07()06()05()04()03()02()01()00()]end", $property->getRawMimeDirValue());
-
- }
-
- function testValidateBadPropertyName() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty("X_*&PROP*", "Bla");
- $result = $property->validate(Property::REPAIR);
-
- $this->assertEquals($result[0]['message'], 'The propertyname: X_*&PROP* contains invalid characters. Only A-Z, 0-9 and - are allowed');
- $this->assertEquals('X-PROP', $property->name);
-
- }
-
- function testGetValue() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty("SUMMARY", null);
- $this->assertEquals([], $property->getParts());
- $this->assertNull($property->getValue());
-
- $property->setValue([]);
- $this->assertEquals([], $property->getParts());
- $this->assertNull($property->getValue());
-
- $property->setValue([1]);
- $this->assertEquals([1], $property->getParts());
- $this->assertEquals(1, $property->getValue());
-
- $property->setValue([1, 2]);
- $this->assertEquals([1, 2], $property->getParts());
- $this->assertEquals('1,2', $property->getValue());
-
- $property->setValue('str');
- $this->assertEquals(['str'], $property->getParts());
- $this->assertEquals('str', $property->getValue());
- }
-
- /**
- * ElementList should reject this.
- *
- * @expectedException \LogicException
- */
- function testArrayAccessSetInt() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty("X-PROP", null);
-
- $calendar->add($property);
- $calendar->{'X-PROP'}[0] = 'Something!';
-
- }
-
- /**
- * ElementList should reject this.
- *
- * @expectedException \LogicException
- */
- function testArrayAccessUnsetInt() {
-
- $calendar = new VCalendar();
- $property = $calendar->createProperty("X-PROP", null);
-
- $calendar->add($property);
- unset($calendar->{'X-PROP'}[0]);
-
- }
-
- function testValidateBadEncoding() {
-
- $document = new VCalendar();
- $property = $document->add('X-FOO', 'value');
- $property['ENCODING'] = 'invalid';
-
- $result = $property->validate();
-
- $this->assertEquals('ENCODING=INVALID is not valid for this document type.', $result[0]['message']);
- $this->assertEquals(3, $result[0]['level']);
-
- }
-
- function testValidateBadEncodingVCard4() {
-
- $document = new VCard(['VERSION' => '4.0']);
- $property = $document->add('X-FOO', 'value');
- $property['ENCODING'] = 'BASE64';
-
- $result = $property->validate();
-
- $this->assertEquals('ENCODING parameter is not valid in vCard 4.', $result[0]['message']);
- $this->assertEquals(3, $result[0]['level']);
-
- }
-
- function testValidateBadEncodingVCard3() {
-
- $document = new VCard(['VERSION' => '3.0']);
- $property = $document->add('X-FOO', 'value');
- $property['ENCODING'] = 'BASE64';
-
- $result = $property->validate();
-
- $this->assertEquals('ENCODING=BASE64 is not valid for this document type.', $result[0]['message']);
- $this->assertEquals(3, $result[0]['level']);
-
- }
-
- function testValidateBadEncodingVCard21() {
-
- $document = new VCard(['VERSION' => '2.1']);
- $property = $document->add('X-FOO', 'value');
- $property['ENCODING'] = 'B';
-
- $result = $property->validate();
-
- $this->assertEquals('ENCODING=B is not valid for this document type.', $result[0]['message']);
- $this->assertEquals(3, $result[0]['level']);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ReaderTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/ReaderTest.php
deleted file mode 100644
index 7c3217b7663..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/ReaderTest.php
+++ /dev/null
@@ -1,491 +0,0 @@
-assertInstanceOf('Sabre\\VObject\\Component', $result);
- $this->assertEquals('VCALENDAR', $result->name);
- $this->assertEquals(0, count($result->children()));
-
- }
-
- function testReadStream() {
-
- $data = "BEGIN:VCALENDAR\r\nEND:VCALENDAR";
-
- $stream = fopen('php://memory', 'r+');
- fwrite($stream, $data);
- rewind($stream);
-
- $result = Reader::read($stream);
-
- $this->assertInstanceOf('Sabre\\VObject\\Component', $result);
- $this->assertEquals('VCALENDAR', $result->name);
- $this->assertEquals(0, count($result->children()));
-
- }
-
- function testReadComponentUnixNewLine() {
-
- $data = "BEGIN:VCALENDAR\nEND:VCALENDAR";
-
- $result = Reader::read($data);
-
- $this->assertInstanceOf('Sabre\\VObject\\Component', $result);
- $this->assertEquals('VCALENDAR', $result->name);
- $this->assertEquals(0, count($result->children()));
-
- }
-
- function testReadComponentLineFold() {
-
- $data = "BEGIN:\r\n\tVCALENDAR\r\nE\r\n ND:VCALENDAR";
-
- $result = Reader::read($data);
-
- $this->assertInstanceOf('Sabre\\VObject\\Component', $result);
- $this->assertEquals('VCALENDAR', $result->name);
- $this->assertEquals(0, count($result->children()));
-
- }
-
- /**
- * @expectedException Sabre\VObject\ParseException
- */
- function testReadCorruptComponent() {
-
- $data = "BEGIN:VCALENDAR\r\nEND:FOO";
-
- $result = Reader::read($data);
-
- }
-
- /**
- * @expectedException Sabre\VObject\ParseException
- */
- function testReadCorruptSubComponent() {
-
- $data = "BEGIN:VCALENDAR\r\nBEGIN:VEVENT\r\nEND:FOO\r\nEND:VCALENDAR";
-
- $result = Reader::read($data);
-
- }
-
- function testReadProperty() {
-
- $data = "BEGIN:VCALENDAR\r\nSUMMARY:propValue\r\nEND:VCALENDAR";
- $result = Reader::read($data);
-
- $result = $result->SUMMARY;
- $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
- $this->assertEquals('SUMMARY', $result->name);
- $this->assertEquals('propValue', $result->getValue());
-
- }
-
- function testReadPropertyWithNewLine() {
-
- $data = "BEGIN:VCALENDAR\r\nSUMMARY:Line1\\nLine2\\NLine3\\\\Not the 4th line!\r\nEND:VCALENDAR";
- $result = Reader::read($data);
-
- $result = $result->SUMMARY;
- $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
- $this->assertEquals('SUMMARY', $result->name);
- $this->assertEquals("Line1\nLine2\nLine3\\Not the 4th line!", $result->getValue());
-
- }
-
- function testReadMappedProperty() {
-
- $data = "BEGIN:VCALENDAR\r\nDTSTART:20110529\r\nEND:VCALENDAR";
- $result = Reader::read($data);
-
- $result = $result->DTSTART;
- $this->assertInstanceOf('Sabre\\VObject\\Property\\ICalendar\\DateTime', $result);
- $this->assertEquals('DTSTART', $result->name);
- $this->assertEquals('20110529', $result->getValue());
-
- }
-
- function testReadMappedPropertyGrouped() {
-
- $data = "BEGIN:VCALENDAR\r\nfoo.DTSTART:20110529\r\nEND:VCALENDAR";
- $result = Reader::read($data);
-
- $result = $result->DTSTART;
- $this->assertInstanceOf('Sabre\\VObject\\Property\\ICalendar\\DateTime', $result);
- $this->assertEquals('DTSTART', $result->name);
- $this->assertEquals('20110529', $result->getValue());
-
- }
-
- /**
- * @expectedException Sabre\VObject\ParseException
- */
- function testReadBrokenLine() {
-
- $data = "BEGIN:VCALENDAR\r\nPROPNAME;propValue";
- $result = Reader::read($data);
-
- }
-
- function testReadPropertyInComponent() {
-
- $data = [
- "BEGIN:VCALENDAR",
- "PROPNAME:propValue",
- "END:VCALENDAR"
- ];
-
- $result = Reader::read(implode("\r\n", $data));
-
- $this->assertInstanceOf('Sabre\\VObject\\Component', $result);
- $this->assertEquals('VCALENDAR', $result->name);
- $this->assertEquals(1, count($result->children()));
- $this->assertInstanceOf('Sabre\\VObject\\Property', $result->children()[0]);
- $this->assertEquals('PROPNAME', $result->children()[0]->name);
- $this->assertEquals('propValue', $result->children()[0]->getValue());
-
- }
-
- function testReadNestedComponent() {
-
- $data = [
- "BEGIN:VCALENDAR",
- "BEGIN:VTIMEZONE",
- "BEGIN:DAYLIGHT",
- "END:DAYLIGHT",
- "END:VTIMEZONE",
- "END:VCALENDAR"
- ];
-
- $result = Reader::read(implode("\r\n", $data));
-
- $this->assertInstanceOf('Sabre\\VObject\\Component', $result);
- $this->assertEquals('VCALENDAR', $result->name);
- $this->assertEquals(1, count($result->children()));
- $this->assertInstanceOf('Sabre\\VObject\\Component', $result->children()[0]);
- $this->assertEquals('VTIMEZONE', $result->children()[0]->name);
- $this->assertEquals(1, count($result->children()[0]->children()));
- $this->assertInstanceOf('Sabre\\VObject\\Component', $result->children()[0]->children()[0]);
- $this->assertEquals('DAYLIGHT', $result->children()[0]->children()[0]->name);
-
-
- }
-
- function testReadPropertyParameter() {
-
- $data = "BEGIN:VCALENDAR\r\nPROPNAME;PARAMNAME=paramvalue:propValue\r\nEND:VCALENDAR";
- $result = Reader::read($data);
-
- $result = $result->PROPNAME;
-
- $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
- $this->assertEquals('PROPNAME', $result->name);
- $this->assertEquals('propValue', $result->getValue());
- $this->assertEquals(1, count($result->parameters()));
- $this->assertEquals('PARAMNAME', $result->parameters['PARAMNAME']->name);
- $this->assertEquals('paramvalue', $result->parameters['PARAMNAME']->getValue());
-
- }
-
- function testReadPropertyRepeatingParameter() {
-
- $data = "BEGIN:VCALENDAR\r\nPROPNAME;N=1;N=2;N=3,4;N=\"5\",6;N=\"7,8\";N=9,10;N=^'11^':propValue\r\nEND:VCALENDAR";
- $result = Reader::read($data);
-
- $result = $result->PROPNAME;
-
- $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
- $this->assertEquals('PROPNAME', $result->name);
- $this->assertEquals('propValue', $result->getValue());
- $this->assertEquals(1, count($result->parameters()));
- $this->assertEquals('N', $result->parameters['N']->name);
- $this->assertEquals('1,2,3,4,5,6,7,8,9,10,"11"', $result->parameters['N']->getValue());
- $this->assertEquals([1, 2, 3, 4, 5, 6, "7,8", 9, 10, '"11"'], $result->parameters['N']->getParts());
-
- }
-
- function testReadPropertyRepeatingNamelessGuessedParameter() {
-
- $data = "BEGIN:VCALENDAR\r\nPROPNAME;WORK;VOICE;PREF:propValue\r\nEND:VCALENDAR";
- $result = Reader::read($data);
-
- $result = $result->PROPNAME;
-
- $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
- $this->assertEquals('PROPNAME', $result->name);
- $this->assertEquals('propValue', $result->getValue());
- $this->assertEquals(1, count($result->parameters()));
- $this->assertEquals('TYPE', $result->parameters['TYPE']->name);
- $this->assertEquals('WORK,VOICE,PREF', $result->parameters['TYPE']->getValue());
- $this->assertEquals(['WORK', 'VOICE', 'PREF'], $result->parameters['TYPE']->getParts());
-
- }
-
- function testReadPropertyNoName() {
-
- $data = "BEGIN:VCALENDAR\r\nPROPNAME;PRODIGY:propValue\r\nEND:VCALENDAR";
- $result = Reader::read($data);
-
- $result = $result->PROPNAME;
-
- $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
- $this->assertEquals('PROPNAME', $result->name);
- $this->assertEquals('propValue', $result->getValue());
- $this->assertEquals(1, count($result->parameters()));
- $this->assertEquals('TYPE', $result->parameters['TYPE']->name);
- $this->assertTrue($result->parameters['TYPE']->noName);
- $this->assertEquals('PRODIGY', $result->parameters['TYPE']);
-
- }
-
- function testReadPropertyParameterExtraColon() {
-
- $data = "BEGIN:VCALENDAR\r\nPROPNAME;PARAMNAME=paramvalue:propValue:anotherrandomstring\r\nEND:VCALENDAR";
- $result = Reader::read($data);
-
- $result = $result->PROPNAME;
-
- $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
- $this->assertEquals('PROPNAME', $result->name);
- $this->assertEquals('propValue:anotherrandomstring', $result->getValue());
- $this->assertEquals(1, count($result->parameters()));
- $this->assertEquals('PARAMNAME', $result->parameters['PARAMNAME']->name);
- $this->assertEquals('paramvalue', $result->parameters['PARAMNAME']->getValue());
-
- }
-
- function testReadProperty2Parameters() {
-
- $data = "BEGIN:VCALENDAR\r\nPROPNAME;PARAMNAME=paramvalue;PARAMNAME2=paramvalue2:propValue\r\nEND:VCALENDAR";
- $result = Reader::read($data);
-
- $result = $result->PROPNAME;
-
- $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
- $this->assertEquals('PROPNAME', $result->name);
- $this->assertEquals('propValue', $result->getValue());
- $this->assertEquals(2, count($result->parameters()));
- $this->assertEquals('PARAMNAME', $result->parameters['PARAMNAME']->name);
- $this->assertEquals('paramvalue', $result->parameters['PARAMNAME']->getValue());
- $this->assertEquals('PARAMNAME2', $result->parameters['PARAMNAME2']->name);
- $this->assertEquals('paramvalue2', $result->parameters['PARAMNAME2']->getValue());
-
- }
-
- function testReadPropertyParameterQuoted() {
-
- $data = "BEGIN:VCALENDAR\r\nPROPNAME;PARAMNAME=\"paramvalue\":propValue\r\nEND:VCALENDAR";
- $result = Reader::read($data);
-
- $result = $result->PROPNAME;
-
- $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
- $this->assertEquals('PROPNAME', $result->name);
- $this->assertEquals('propValue', $result->getValue());
- $this->assertEquals(1, count($result->parameters()));
- $this->assertEquals('PARAMNAME', $result->parameters['PARAMNAME']->name);
- $this->assertEquals('paramvalue', $result->parameters['PARAMNAME']->getValue());
-
- }
-
- function testReadPropertyParameterNewLines() {
-
- $data = "BEGIN:VCALENDAR\r\nPROPNAME;PARAMNAME=paramvalue1^nvalue2^^nvalue3:propValue\r\nEND:VCALENDAR";
- $result = Reader::read($data);
-
- $result = $result->PROPNAME;
-
- $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
- $this->assertEquals('PROPNAME', $result->name);
- $this->assertEquals('propValue', $result->getValue());
-
- $this->assertEquals(1, count($result->parameters()));
- $this->assertEquals('PARAMNAME', $result->parameters['PARAMNAME']->name);
- $this->assertEquals("paramvalue1\nvalue2^nvalue3", $result->parameters['PARAMNAME']->getValue());
-
- }
-
- function testReadPropertyParameterQuotedColon() {
-
- $data = "BEGIN:VCALENDAR\r\nPROPNAME;PARAMNAME=\"param:value\":propValue\r\nEND:VCALENDAR";
- $result = Reader::read($data);
- $result = $result->PROPNAME;
-
- $this->assertInstanceOf('Sabre\\VObject\\Property', $result);
- $this->assertEquals('PROPNAME', $result->name);
- $this->assertEquals('propValue', $result->getValue());
- $this->assertEquals(1, count($result->parameters()));
- $this->assertEquals('PARAMNAME', $result->parameters['PARAMNAME']->name);
- $this->assertEquals('param:value', $result->parameters['PARAMNAME']->getValue());
-
- }
-
- function testReadForgiving() {
-
- $data = [
- "BEGIN:VCALENDAR",
- "X_PROP:propValue",
- "END:VCALENDAR"
- ];
-
- $caught = false;
- try {
- $result = Reader::read(implode("\r\n", $data));
- } catch (ParseException $e) {
- $caught = true;
- }
-
- $this->assertEquals(true, $caught);
-
- $result = Reader::read(implode("\r\n", $data), Reader::OPTION_FORGIVING);
-
- $expected = implode("\r\n", [
- "BEGIN:VCALENDAR",
- "X_PROP:propValue",
- "END:VCALENDAR",
- ""
- ]);
-
- $this->assertEquals($expected, $result->serialize());
-
- }
-
- function testReadWithInvalidLine() {
-
- $data = [
- "BEGIN:VCALENDAR",
- "DESCRIPTION:propValue",
- "Yes, we've actually seen a file with non-idented property values on multiple lines",
- "END:VCALENDAR"
- ];
-
- $caught = false;
- try {
- $result = Reader::read(implode("\r\n", $data));
- } catch (ParseException $e) {
- $caught = true;
- }
-
- $this->assertEquals(true, $caught);
-
- $result = Reader::read(implode("\r\n", $data), Reader::OPTION_IGNORE_INVALID_LINES);
-
- $expected = implode("\r\n", [
- "BEGIN:VCALENDAR",
- "DESCRIPTION:propValue",
- "END:VCALENDAR",
- ""
- ]);
-
- $this->assertEquals($expected, $result->serialize());
-
- }
-
- /**
- * Reported as Issue 32.
- *
- * @expectedException \Sabre\VObject\ParseException
- */
- function testReadIncompleteFile() {
-
- $input = <<assertInstanceOf('Sabre\\VObject\\Component', $result);
- $this->assertEquals('VCALENDAR', $result->name);
- $this->assertEquals(0, count($result->children()));
-
- }
-
- function testReadXMLComponent() {
-
- $data = <<
-
-
-
-
-XML;
-
- $result = Reader::readXML($data);
-
- $this->assertInstanceOf('Sabre\\VObject\\Component', $result);
- $this->assertEquals('VCALENDAR', $result->name);
- $this->assertEquals(0, count($result->children()));
-
- }
-
- function testReadXMLStream() {
-
- $data = <<
-
-
-
-
-XML;
-
- $stream = fopen('php://memory', 'r+');
- fwrite($stream, $data);
- rewind($stream);
-
- $result = Reader::readXML($stream);
-
- $this->assertInstanceOf('Sabre\\VObject\\Component', $result);
- $this->assertEquals('VCALENDAR', $result->name);
- $this->assertEquals(0, count($result->children()));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/ByMonthInDailyTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/ByMonthInDailyTest.php
deleted file mode 100644
index 204dd36df0f..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/ByMonthInDailyTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-assertInstanceOf('Sabre\\VObject\\Component\\VCalendar', $vcal);
-
- $vcal = $vcal->expand(new DateTime('2013-09-28'), new DateTime('2014-09-11'));
-
- foreach ($vcal->VEVENT as $event) {
- $dates[] = $event->DTSTART->getValue();
- }
-
- $expectedDates = [
- "20130929T160000Z",
- "20131006T160000Z",
- "20131013T160000Z",
- "20131020T160000Z",
- "20131027T160000Z",
- "20140907T160000Z"
- ];
-
- $this->assertEquals($expectedDates, $dates, 'Recursed dates are restricted by month');
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/BySetPosHangTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/BySetPosHangTest.php
deleted file mode 100644
index 65e38f536e8..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/BySetPosHangTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-assertInstanceOf('Sabre\\VObject\\Component\\VCalendar', $vcal);
-
- $vcal = $vcal->expand(new DateTime('2015-01-01'), new DateTime('2016-01-01'));
-
- foreach ($vcal->VEVENT as $event) {
- $dates[] = $event->DTSTART->getValue();
- }
-
- $expectedDates = [
- "20150101T160000Z",
- "20150122T160000Z",
- "20150219T160000Z",
- "20150319T160000Z",
- "20150423T150000Z",
- "20150521T150000Z",
- "20150618T150000Z",
- "20150723T150000Z",
- "20150820T150000Z",
- "20150917T150000Z",
- "20151022T150000Z",
- "20151119T160000Z",
- "20151224T160000Z",
- ];
-
- $this->assertEquals($expectedDates, $dates);
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/ExpandFloatingTimesTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/ExpandFloatingTimesTest.php
deleted file mode 100644
index 3d7b6f19c82..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/ExpandFloatingTimesTest.php
+++ /dev/null
@@ -1,122 +0,0 @@
-assertInstanceOf('Sabre\\VObject\\Component\\VCalendar', $vcal);
-
- $vcal = $vcal->expand(new DateTime('2015-01-01'), new DateTime('2015-01-31'));
- $output = <<assertVObjectEqualsVObject($output, $vcal);
-
- }
-
- function testExpandWithReferenceTimezone() {
-
- $input = <<assertInstanceOf('Sabre\\VObject\\Component\\VCalendar', $vcal);
-
- $vcal = $vcal->expand(
- new DateTime('2015-01-01'),
- new DateTime('2015-01-31'),
- new DateTimeZone('Europe/Berlin')
- );
-
- $output = <<assertVObjectEqualsVObject($output, $vcal);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/FifthTuesdayProblemTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/FifthTuesdayProblemTest.php
deleted file mode 100644
index 2029ec9c5c6..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/FifthTuesdayProblemTest.php
+++ /dev/null
@@ -1,54 +0,0 @@
-VEVENT->UID);
-
- while ($it->valid()) {
- $it->next();
- }
-
- // If we got here, it means we were successful. The bug that was in the
- // system before would fail on the 5th tuesday of the month, if the 5th
- // tuesday did not exist.
- $this->assertTrue(true);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/HandleRDateExpandTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/HandleRDateExpandTest.php
deleted file mode 100644
index 32dcf9330f7..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/HandleRDateExpandTest.php
+++ /dev/null
@@ -1,60 +0,0 @@
-assertInstanceOf('Sabre\\VObject\\Component\\VCalendar', $vcal);
-
- $vcal = $vcal->expand(new DateTime('2015-01-01'), new DateTime('2015-12-01'));
-
- $result = iterator_to_array($vcal->VEVENT);
-
- $this->assertEquals(5, count($result));
-
- $utc = new DateTimeZone('UTC');
- $expected = [
- new DateTimeImmutable("2015-10-12", $utc),
- new DateTimeImmutable("2015-10-15", $utc),
- new DateTimeImmutable("2015-10-17", $utc),
- new DateTimeImmutable("2015-10-18", $utc),
- new DateTimeImmutable("2015-10-20", $utc),
- ];
-
- $result = array_map(function($ev) {return $ev->DTSTART->getDateTime();}, $result);
- $this->assertEquals($expected, $result);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/IncorrectExpandTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/IncorrectExpandTest.php
deleted file mode 100644
index 82278293d61..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/IncorrectExpandTest.php
+++ /dev/null
@@ -1,62 +0,0 @@
-assertInstanceOf('Sabre\\VObject\\Component\\VCalendar', $vcal);
-
- $vcal = $vcal->expand(new DateTime('2011-01-01'), new DateTime('2014-01-01'));
-
- $output = <<assertVObjectEqualsVObject($output, $vcal);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/InfiniteLoopProblemTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/InfiniteLoopProblemTest.php
deleted file mode 100644
index 491b0e87970..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/InfiniteLoopProblemTest.php
+++ /dev/null
@@ -1,98 +0,0 @@
-vcal = new VCalendar();
-
- }
-
- /**
- * This bug came from a Fruux customer. This would result in a never-ending
- * request.
- */
- function testFastForwardTooFar() {
-
- $ev = $this->vcal->createComponent('VEVENT');
- $ev->UID = 'foobar';
- $ev->DTSTART = '20090420T180000Z';
- $ev->RRULE = 'FREQ=WEEKLY;BYDAY=MO;UNTIL=20090704T205959Z;INTERVAL=1';
-
- $this->assertFalse($ev->isInTimeRange(new DateTimeImmutable('2012-01-01 12:00:00'), new DateTimeImmutable('3000-01-01 00:00:00')));
-
- }
-
- /**
- * Different bug, also likely an infinite loop.
- */
- function testYearlyByMonthLoop() {
-
- $ev = $this->vcal->createComponent('VEVENT');
- $ev->UID = 'uuid';
- $ev->DTSTART = '20120101T154500';
- $ev->DTSTART['TZID'] = 'Europe/Berlin';
- $ev->RRULE = 'FREQ=YEARLY;INTERVAL=1;UNTIL=20120203T225959Z;BYMONTH=2;BYSETPOS=1;BYDAY=SU,MO,TU,WE,TH,FR,SA';
- $ev->DTEND = '20120101T164500';
- $ev->DTEND['TZID'] = 'Europe/Berlin';
-
- // This recurrence rule by itself is a yearly rule that should happen
- // every february.
- //
- // The BYDAY part expands this to every day of the month, but the
- // BYSETPOS limits this to only the 1st day of the month. Very crazy
- // way to specify this, and could have certainly been a lot easier.
- $this->vcal->add($ev);
-
- $it = new Recur\EventIterator($this->vcal, 'uuid');
- $it->fastForward(new DateTimeImmutable('2012-01-29 23:00:00', new DateTimeZone('UTC')));
-
- $collect = [];
-
- while ($it->valid()) {
- $collect[] = $it->getDtStart();
- if ($it->getDtStart() > new DateTimeImmutable('2013-02-05 22:59:59', new DateTimeZone('UTC'))) {
- break;
- }
- $it->next();
-
- }
-
- $this->assertEquals(
- [new DateTimeImmutable('2012-02-01 15:45:00', new DateTimeZone('Europe/Berlin'))],
- $collect
- );
-
- }
-
- /**
- * Something, somewhere produced an ics with an interval set to 0. Because
- * this means we increase the current day (or week, month) by 0, this also
- * results in an infinite loop.
- *
- * @expectedException \Sabre\VObject\InvalidDataException
- * @return void
- */
- function testZeroInterval() {
-
- $ev = $this->vcal->createComponent('VEVENT');
- $ev->UID = 'uuid';
- $ev->DTSTART = '20120824T145700Z';
- $ev->RRULE = 'FREQ=YEARLY;INTERVAL=0';
- $this->vcal->add($ev);
-
- $it = new Recur\EventIterator($this->vcal, 'uuid');
- $it->fastForward(new DateTimeImmutable('2013-01-01 23:00:00', new DateTimeZone('UTC')));
-
- // if we got this far.. it means we are no longer infinitely looping
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/Issue26Test.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/Issue26Test.php
deleted file mode 100644
index df8619da579..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/Issue26Test.php
+++ /dev/null
@@ -1,34 +0,0 @@
-assertInstanceOf('Sabre\\VObject\\Component\\VCalendar', $vcal);
-
- $it = new EventIterator($vcal, 'bae5d57a98');
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/Issue48Test.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/Issue48Test.php
deleted file mode 100644
index 179da816dda..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/Issue48Test.php
+++ /dev/null
@@ -1,48 +0,0 @@
-assertInstanceOf('Sabre\\VObject\\Component\\VCalendar', $vcal);
-
- $it = new Recur\EventIterator($vcal, 'foo');
-
- $result = iterator_to_array($it);
-
- $tz = new DateTimeZone('Europe/Moscow');
-
- $expected = [
- new DateTimeImmutable('2013-07-10 11:00:00', $tz),
- new DateTimeImmutable('2013-07-12 11:00:00', $tz),
- new DateTimeImmutable('2013-07-13 11:00:00', $tz),
- ];
-
- $this->assertEquals($expected, $result);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/Issue50Test.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/Issue50Test.php
deleted file mode 100644
index 193bdd878de..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/Issue50Test.php
+++ /dev/null
@@ -1,127 +0,0 @@
-assertInstanceOf('Sabre\\VObject\\Component\\VCalendar', $vcal);
-
- $it = new Recur\EventIterator($vcal, '1aef0b27-3d92-4581-829a-11999dd36724');
-
- $result = [];
- foreach ($it as $instance) {
-
- $result[] = $instance;
-
- }
-
- $tz = new DateTimeZone('Europe/Brussels');
-
- $this->assertEquals([
- new DateTimeImmutable('2013-07-15 09:00:00', $tz),
- new DateTimeImmutable('2013-07-16 07:00:00', $tz),
- new DateTimeImmutable('2013-07-17 07:00:00', $tz),
- new DateTimeImmutable('2013-07-18 09:00:00', $tz),
- new DateTimeImmutable('2013-07-19 07:00:00', $tz),
- ], $result);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/MainTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/MainTest.php
deleted file mode 100644
index 0d8c5b188c6..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/MainTest.php
+++ /dev/null
@@ -1,1452 +0,0 @@
-createComponent('VEVENT');
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=DAILY;BYHOUR=10;BYMINUTE=5;BYSECOND=16;BYWEEKNO=32;BYYEARDAY=100,200';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-10-07'));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- $this->assertTrue($it->isInfinite());
-
- }
-
- /**
- * @expectedException \Sabre\VObject\InvalidDataException
- * @depends testValues
- */
- function testInvalidFreq() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
- $ev->RRULE = 'FREQ=SMONTHLY;INTERVAL=3;UNTIL=20111025T000000Z';
- $ev->UID = 'foo';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-10-07', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testVCalendarNoUID() {
-
- $vcal = new VCalendar();
- $it = new EventIterator($vcal);
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testVCalendarInvalidUID() {
-
- $vcal = new VCalendar();
- $it = new EventIterator($vcal, 'foo');
-
- }
-
- /**
- * @depends testValues
- */
- function testHourly() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=HOURLY;INTERVAL=3;UNTIL=20111025T000000Z';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-10-07 12:00:00', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, $ev->UID);
-
- // Max is to prevent overflow
- $max = 12;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-10-07 12:00:00', $tz),
- new DateTimeImmutable('2011-10-07 15:00:00', $tz),
- new DateTimeImmutable('2011-10-07 18:00:00', $tz),
- new DateTimeImmutable('2011-10-07 21:00:00', $tz),
- new DateTimeImmutable('2011-10-08 00:00:00', $tz),
- new DateTimeImmutable('2011-10-08 03:00:00', $tz),
- new DateTimeImmutable('2011-10-08 06:00:00', $tz),
- new DateTimeImmutable('2011-10-08 09:00:00', $tz),
- new DateTimeImmutable('2011-10-08 12:00:00', $tz),
- new DateTimeImmutable('2011-10-08 15:00:00', $tz),
- new DateTimeImmutable('2011-10-08 18:00:00', $tz),
- new DateTimeImmutable('2011-10-08 21:00:00', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * @depends testValues
- */
- function testDaily() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=DAILY;INTERVAL=3;UNTIL=20111025T000000Z';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-10-07', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, $ev->UID);
-
- // Max is to prevent overflow
- $max = 12;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-10-07', $tz),
- new DateTimeImmutable('2011-10-10', $tz),
- new DateTimeImmutable('2011-10-13', $tz),
- new DateTimeImmutable('2011-10-16', $tz),
- new DateTimeImmutable('2011-10-19', $tz),
- new DateTimeImmutable('2011-10-22', $tz),
- new DateTimeImmutable('2011-10-25', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * @depends testValues
- */
- function testNoRRULE() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-10-07', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, $ev->UID);
-
- // Max is to prevent overflow
- $max = 12;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-10-07', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * @depends testValues
- */
- function testDailyByDayByHour() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=DAILY;BYDAY=SA,SU;BYHOUR=6,7';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-10-08 06:00:00', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- // Grabbing the next 12 items
- $max = 12;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-10-08 06:00:00', $tz),
- new DateTimeImmutable('2011-10-08 07:00:00', $tz),
- new DateTimeImmutable('2011-10-09 06:00:00', $tz),
- new DateTimeImmutable('2011-10-09 07:00:00', $tz),
- new DateTimeImmutable('2011-10-15 06:00:00', $tz),
- new DateTimeImmutable('2011-10-15 07:00:00', $tz),
- new DateTimeImmutable('2011-10-16 06:00:00', $tz),
- new DateTimeImmutable('2011-10-16 07:00:00', $tz),
- new DateTimeImmutable('2011-10-22 06:00:00', $tz),
- new DateTimeImmutable('2011-10-22 07:00:00', $tz),
- new DateTimeImmutable('2011-10-23 06:00:00', $tz),
- new DateTimeImmutable('2011-10-23 07:00:00', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * @depends testValues
- */
- function testDailyByHour() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=DAILY;INTERVAL=2;BYHOUR=10,11,12,13,14,15';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2012-10-11 12:00:00', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- // Grabbing the next 12 items
- $max = 12;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2012-10-11 12:00:00', $tz),
- new DateTimeImmutable('2012-10-11 13:00:00', $tz),
- new DateTimeImmutable('2012-10-11 14:00:00', $tz),
- new DateTimeImmutable('2012-10-11 15:00:00', $tz),
- new DateTimeImmutable('2012-10-13 10:00:00', $tz),
- new DateTimeImmutable('2012-10-13 11:00:00', $tz),
- new DateTimeImmutable('2012-10-13 12:00:00', $tz),
- new DateTimeImmutable('2012-10-13 13:00:00', $tz),
- new DateTimeImmutable('2012-10-13 14:00:00', $tz),
- new DateTimeImmutable('2012-10-13 15:00:00', $tz),
- new DateTimeImmutable('2012-10-15 10:00:00', $tz),
- new DateTimeImmutable('2012-10-15 11:00:00', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * @depends testValues
- */
- function testDailyByDay() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=DAILY;INTERVAL=2;BYDAY=TU,WE,FR';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-10-07', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- // Grabbing the next 12 items
- $max = 12;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-10-07', $tz),
- new DateTimeImmutable('2011-10-11', $tz),
- new DateTimeImmutable('2011-10-19', $tz),
- new DateTimeImmutable('2011-10-21', $tz),
- new DateTimeImmutable('2011-10-25', $tz),
- new DateTimeImmutable('2011-11-02', $tz),
- new DateTimeImmutable('2011-11-04', $tz),
- new DateTimeImmutable('2011-11-08', $tz),
- new DateTimeImmutable('2011-11-16', $tz),
- new DateTimeImmutable('2011-11-18', $tz),
- new DateTimeImmutable('2011-11-22', $tz),
- new DateTimeImmutable('2011-11-30', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * @depends testValues
- */
- function testWeekly() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=WEEKLY;INTERVAL=2;COUNT=10';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-10-07', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- // Max is to prevent overflow
- $max = 12;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-10-07', $tz),
- new DateTimeImmutable('2011-10-21', $tz),
- new DateTimeImmutable('2011-11-04', $tz),
- new DateTimeImmutable('2011-11-18', $tz),
- new DateTimeImmutable('2011-12-02', $tz),
- new DateTimeImmutable('2011-12-16', $tz),
- new DateTimeImmutable('2011-12-30', $tz),
- new DateTimeImmutable('2012-01-13', $tz),
- new DateTimeImmutable('2012-01-27', $tz),
- new DateTimeImmutable('2012-02-10', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * @depends testValues
- */
- function testWeeklyByDayByHour() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=WEEKLY;INTERVAL=2;BYDAY=TU,WE,FR;WKST=MO;BYHOUR=8,9,10';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-10-07 08:00:00', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- // Grabbing the next 12 items
- $max = 15;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-10-07 08:00:00', $tz),
- new DateTimeImmutable('2011-10-07 09:00:00', $tz),
- new DateTimeImmutable('2011-10-07 10:00:00', $tz),
- new DateTimeImmutable('2011-10-18 08:00:00', $tz),
- new DateTimeImmutable('2011-10-18 09:00:00', $tz),
- new DateTimeImmutable('2011-10-18 10:00:00', $tz),
- new DateTimeImmutable('2011-10-19 08:00:00', $tz),
- new DateTimeImmutable('2011-10-19 09:00:00', $tz),
- new DateTimeImmutable('2011-10-19 10:00:00', $tz),
- new DateTimeImmutable('2011-10-21 08:00:00', $tz),
- new DateTimeImmutable('2011-10-21 09:00:00', $tz),
- new DateTimeImmutable('2011-10-21 10:00:00', $tz),
- new DateTimeImmutable('2011-11-01 08:00:00', $tz),
- new DateTimeImmutable('2011-11-01 09:00:00', $tz),
- new DateTimeImmutable('2011-11-01 10:00:00', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * @depends testValues
- */
- function testWeeklyByDaySpecificHour() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=WEEKLY;INTERVAL=2;BYDAY=TU,WE,FR;WKST=SU';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-10-07 18:00:00', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- // Grabbing the next 12 items
- $max = 12;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-10-07 18:00:00', $tz),
- new DateTimeImmutable('2011-10-18 18:00:00', $tz),
- new DateTimeImmutable('2011-10-19 18:00:00', $tz),
- new DateTimeImmutable('2011-10-21 18:00:00', $tz),
- new DateTimeImmutable('2011-11-01 18:00:00', $tz),
- new DateTimeImmutable('2011-11-02 18:00:00', $tz),
- new DateTimeImmutable('2011-11-04 18:00:00', $tz),
- new DateTimeImmutable('2011-11-15 18:00:00', $tz),
- new DateTimeImmutable('2011-11-16 18:00:00', $tz),
- new DateTimeImmutable('2011-11-18 18:00:00', $tz),
- new DateTimeImmutable('2011-11-29 18:00:00', $tz),
- new DateTimeImmutable('2011-11-30 18:00:00', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * @depends testValues
- */
- function testWeeklyByDay() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=WEEKLY;INTERVAL=2;BYDAY=TU,WE,FR;WKST=SU';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-10-07', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- // Grabbing the next 12 items
- $max = 12;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-10-07', $tz),
- new DateTimeImmutable('2011-10-18', $tz),
- new DateTimeImmutable('2011-10-19', $tz),
- new DateTimeImmutable('2011-10-21', $tz),
- new DateTimeImmutable('2011-11-01', $tz),
- new DateTimeImmutable('2011-11-02', $tz),
- new DateTimeImmutable('2011-11-04', $tz),
- new DateTimeImmutable('2011-11-15', $tz),
- new DateTimeImmutable('2011-11-16', $tz),
- new DateTimeImmutable('2011-11-18', $tz),
- new DateTimeImmutable('2011-11-29', $tz),
- new DateTimeImmutable('2011-11-30', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * @depends testValues
- */
- function testMonthly() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=MONTHLY;INTERVAL=3;COUNT=5';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-12-05', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- $max = 14;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-12-05', $tz),
- new DateTimeImmutable('2012-03-05', $tz),
- new DateTimeImmutable('2012-06-05', $tz),
- new DateTimeImmutable('2012-09-05', $tz),
- new DateTimeImmutable('2012-12-05', $tz),
- ],
- $result
- );
-
-
- }
-
- /**
- * @depends testValues
- */
- function testMonthlyEndOfMonth() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=MONTHLY;INTERVAL=2;COUNT=12';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-12-31', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- $max = 14;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-12-31', $tz),
- new DateTimeImmutable('2012-08-31', $tz),
- new DateTimeImmutable('2012-10-31', $tz),
- new DateTimeImmutable('2012-12-31', $tz),
- new DateTimeImmutable('2013-08-31', $tz),
- new DateTimeImmutable('2013-10-31', $tz),
- new DateTimeImmutable('2013-12-31', $tz),
- new DateTimeImmutable('2014-08-31', $tz),
- new DateTimeImmutable('2014-10-31', $tz),
- new DateTimeImmutable('2014-12-31', $tz),
- new DateTimeImmutable('2015-08-31', $tz),
- new DateTimeImmutable('2015-10-31', $tz),
- ],
- $result
- );
-
-
- }
-
- /**
- * @depends testValues
- */
- function testMonthlyByMonthDay() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=MONTHLY;INTERVAL=5;COUNT=9;BYMONTHDAY=1,31,-7';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-01-01', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- $max = 14;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-01-01', $tz),
- new DateTimeImmutable('2011-01-25', $tz),
- new DateTimeImmutable('2011-01-31', $tz),
- new DateTimeImmutable('2011-06-01', $tz),
- new DateTimeImmutable('2011-06-24', $tz),
- new DateTimeImmutable('2011-11-01', $tz),
- new DateTimeImmutable('2011-11-24', $tz),
- new DateTimeImmutable('2012-04-01', $tz),
- new DateTimeImmutable('2012-04-24', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * A pretty slow test. Had to be marked as 'medium' for phpunit to not die
- * after 1 second. Would be good to optimize later.
- *
- * @depends testValues
- * @medium
- */
- function testMonthlyByDay() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=MONTHLY;INTERVAL=2;COUNT=16;BYDAY=MO,-2TU,+1WE,3TH';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-01-03', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- $max = 20;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-01-03', $tz),
- new DateTimeImmutable('2011-01-05', $tz),
- new DateTimeImmutable('2011-01-10', $tz),
- new DateTimeImmutable('2011-01-17', $tz),
- new DateTimeImmutable('2011-01-18', $tz),
- new DateTimeImmutable('2011-01-20', $tz),
- new DateTimeImmutable('2011-01-24', $tz),
- new DateTimeImmutable('2011-01-31', $tz),
- new DateTimeImmutable('2011-03-02', $tz),
- new DateTimeImmutable('2011-03-07', $tz),
- new DateTimeImmutable('2011-03-14', $tz),
- new DateTimeImmutable('2011-03-17', $tz),
- new DateTimeImmutable('2011-03-21', $tz),
- new DateTimeImmutable('2011-03-22', $tz),
- new DateTimeImmutable('2011-03-28', $tz),
- new DateTimeImmutable('2011-05-02', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * @depends testValues
- */
- function testMonthlyByDayByMonthDay() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=MONTHLY;COUNT=10;BYDAY=MO;BYMONTHDAY=1';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-08-01', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- $max = 20;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-08-01', $tz),
- new DateTimeImmutable('2012-10-01', $tz),
- new DateTimeImmutable('2013-04-01', $tz),
- new DateTimeImmutable('2013-07-01', $tz),
- new DateTimeImmutable('2014-09-01', $tz),
- new DateTimeImmutable('2014-12-01', $tz),
- new DateTimeImmutable('2015-06-01', $tz),
- new DateTimeImmutable('2016-02-01', $tz),
- new DateTimeImmutable('2016-08-01', $tz),
- new DateTimeImmutable('2017-05-01', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * @depends testValues
- */
- function testMonthlyByDayBySetPos() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=MONTHLY;COUNT=10;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=1,-1';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-01-03', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- $max = 20;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-01-03', $tz),
- new DateTimeImmutable('2011-01-31', $tz),
- new DateTimeImmutable('2011-02-01', $tz),
- new DateTimeImmutable('2011-02-28', $tz),
- new DateTimeImmutable('2011-03-01', $tz),
- new DateTimeImmutable('2011-03-31', $tz),
- new DateTimeImmutable('2011-04-01', $tz),
- new DateTimeImmutable('2011-04-29', $tz),
- new DateTimeImmutable('2011-05-02', $tz),
- new DateTimeImmutable('2011-05-31', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * @depends testValues
- */
- function testYearly() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=YEARLY;COUNT=10;INTERVAL=3';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-01-01', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- $max = 20;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-01-01', $tz),
- new DateTimeImmutable('2014-01-01', $tz),
- new DateTimeImmutable('2017-01-01', $tz),
- new DateTimeImmutable('2020-01-01', $tz),
- new DateTimeImmutable('2023-01-01', $tz),
- new DateTimeImmutable('2026-01-01', $tz),
- new DateTimeImmutable('2029-01-01', $tz),
- new DateTimeImmutable('2032-01-01', $tz),
- new DateTimeImmutable('2035-01-01', $tz),
- new DateTimeImmutable('2038-01-01', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * @depends testValues
- */
- function testYearlyLeapYear() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=YEARLY;COUNT=3';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2012-02-29', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- $max = 20;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2012-02-29', $tz),
- new DateTimeImmutable('2016-02-29', $tz),
- new DateTimeImmutable('2020-02-29', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * @depends testValues
- */
- function testYearlyByMonth() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=YEARLY;COUNT=8;INTERVAL=4;BYMONTH=4,10';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-04-07', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- $max = 20;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-04-07', $tz),
- new DateTimeImmutable('2011-10-07', $tz),
- new DateTimeImmutable('2015-04-07', $tz),
- new DateTimeImmutable('2015-10-07', $tz),
- new DateTimeImmutable('2019-04-07', $tz),
- new DateTimeImmutable('2019-10-07', $tz),
- new DateTimeImmutable('2023-04-07', $tz),
- new DateTimeImmutable('2023-10-07', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * @depends testValues
- */
- function testYearlyByMonthByDay() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=YEARLY;COUNT=8;INTERVAL=5;BYMONTH=4,10;BYDAY=1MO,-1SU';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-04-04', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- $max = 20;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-04-04', $tz),
- new DateTimeImmutable('2011-04-24', $tz),
- new DateTimeImmutable('2011-10-03', $tz),
- new DateTimeImmutable('2011-10-30', $tz),
- new DateTimeImmutable('2016-04-04', $tz),
- new DateTimeImmutable('2016-04-24', $tz),
- new DateTimeImmutable('2016-10-03', $tz),
- new DateTimeImmutable('2016-10-30', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * @depends testValues
- */
- function testFastForward() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=YEARLY;COUNT=8;INTERVAL=5;BYMONTH=4,10;BYDAY=1MO,-1SU';
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-04-04', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- // The idea is that we're fast-forwarding too far in the future, so
- // there will be no results left.
- $it->fastForward(new DateTimeImmutable('2020-05-05', new DateTimeZone('UTC')));
-
- $max = 20;
- $result = [];
- while ($item = $it->current()) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
- $it->next();
-
- }
-
- $this->assertEquals([], $result);
-
- }
-
- /**
- * @depends testValues
- */
- function testFastForwardAllDayEventThatStopAtTheStartTime() {
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=DAILY';
-
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-04-04', new DateTimeZone('UTC')));
- $ev->add($dtStart);
-
- $dtEnd = $vcal->createProperty('DTSTART');
- $dtEnd->setDateTime(new DateTimeImmutable('2011-04-05', new DateTimeZone('UTC')));
- $ev->add($dtEnd);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- $it->fastForward(new DateTimeImmutable('2011-04-05T000000', new DateTimeZone('UTC')));
-
- $this->assertEquals(new DateTimeImmutable('2011-04-06'), $it->getDTStart());
- }
-
- /**
- * @depends testValues
- */
- function testComplexExclusions() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RRULE = 'FREQ=YEARLY;COUNT=10';
- $dtStart = $vcal->createProperty('DTSTART');
-
- $tz = new DateTimeZone('Canada/Eastern');
- $dtStart->setDateTime(new DateTimeImmutable('2011-01-01 13:50:20', $tz));
-
- $exDate1 = $vcal->createProperty('EXDATE');
- $exDate1->setDateTimes([new DateTimeImmutable('2012-01-01 13:50:20', $tz), new DateTimeImmutable('2014-01-01 13:50:20', $tz)]);
- $exDate2 = $vcal->createProperty('EXDATE');
- $exDate2->setDateTimes([new DateTimeImmutable('2016-01-01 13:50:20', $tz)]);
-
- $ev->add($dtStart);
- $ev->add($exDate1);
- $ev->add($exDate2);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, (string)$ev->UID);
-
- $max = 20;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-01-01 13:50:20', $tz),
- new DateTimeImmutable('2013-01-01 13:50:20', $tz),
- new DateTimeImmutable('2015-01-01 13:50:20', $tz),
- new DateTimeImmutable('2017-01-01 13:50:20', $tz),
- new DateTimeImmutable('2018-01-01 13:50:20', $tz),
- new DateTimeImmutable('2019-01-01 13:50:20', $tz),
- new DateTimeImmutable('2020-01-01 13:50:20', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * @depends testValues
- */
- function testOverridenEvent() {
-
- $vcal = new VCalendar();
-
- $ev1 = $vcal->createComponent('VEVENT');
- $ev1->UID = 'overridden';
- $ev1->RRULE = 'FREQ=DAILY;COUNT=10';
- $ev1->DTSTART = '20120107T120000Z';
- $ev1->SUMMARY = 'baseEvent';
-
- $vcal->add($ev1);
-
- // ev2 overrides an event, and puts it on 2pm instead.
- $ev2 = $vcal->createComponent('VEVENT');
- $ev2->UID = 'overridden';
- $ev2->{'RECURRENCE-ID'} = '20120110T120000Z';
- $ev2->DTSTART = '20120110T140000Z';
- $ev2->SUMMARY = 'Event 2';
-
- $vcal->add($ev2);
-
- // ev3 overrides an event, and puts it 2 days and 2 hours later
- $ev3 = $vcal->createComponent('VEVENT');
- $ev3->UID = 'overridden';
- $ev3->{'RECURRENCE-ID'} = '20120113T120000Z';
- $ev3->DTSTART = '20120115T140000Z';
- $ev3->SUMMARY = 'Event 3';
-
- $vcal->add($ev3);
-
- $it = new EventIterator($vcal, 'overridden');
-
- $dates = [];
- $summaries = [];
- while ($it->valid()) {
-
- $dates[] = $it->getDTStart();
- $summaries[] = (string)$it->getEventObject()->SUMMARY;
- $it->next();
-
- }
-
- $tz = new DateTimeZone('UTC');
- $this->assertEquals([
- new DateTimeImmutable('2012-01-07 12:00:00', $tz),
- new DateTimeImmutable('2012-01-08 12:00:00', $tz),
- new DateTimeImmutable('2012-01-09 12:00:00', $tz),
- new DateTimeImmutable('2012-01-10 14:00:00', $tz),
- new DateTimeImmutable('2012-01-11 12:00:00', $tz),
- new DateTimeImmutable('2012-01-12 12:00:00', $tz),
- new DateTimeImmutable('2012-01-14 12:00:00', $tz),
- new DateTimeImmutable('2012-01-15 12:00:00', $tz),
- new DateTimeImmutable('2012-01-15 14:00:00', $tz),
- new DateTimeImmutable('2012-01-16 12:00:00', $tz),
- ], $dates);
-
- $this->assertEquals([
- 'baseEvent',
- 'baseEvent',
- 'baseEvent',
- 'Event 2',
- 'baseEvent',
- 'baseEvent',
- 'baseEvent',
- 'baseEvent',
- 'Event 3',
- 'baseEvent',
- ], $summaries);
-
- }
-
- /**
- * @depends testValues
- */
- function testOverridenEvent2() {
-
- $vcal = new VCalendar();
-
- $ev1 = $vcal->createComponent('VEVENT');
- $ev1->UID = 'overridden';
- $ev1->RRULE = 'FREQ=WEEKLY;COUNT=3';
- $ev1->DTSTART = '20120112T120000Z';
- $ev1->SUMMARY = 'baseEvent';
-
- $vcal->add($ev1);
-
- // ev2 overrides an event, and puts it 6 days earlier instead.
- $ev2 = $vcal->createComponent('VEVENT');
- $ev2->UID = 'overridden';
- $ev2->{'RECURRENCE-ID'} = '20120119T120000Z';
- $ev2->DTSTART = '20120113T120000Z';
- $ev2->SUMMARY = 'Override!';
-
- $vcal->add($ev2);
-
- $it = new EventIterator($vcal, 'overridden');
-
- $dates = [];
- $summaries = [];
- while ($it->valid()) {
-
- $dates[] = $it->getDTStart();
- $summaries[] = (string)$it->getEventObject()->SUMMARY;
- $it->next();
-
- }
-
- $tz = new DateTimeZone('UTC');
- $this->assertEquals([
- new DateTimeImmutable('2012-01-12 12:00:00', $tz),
- new DateTimeImmutable('2012-01-13 12:00:00', $tz),
- new DateTimeImmutable('2012-01-26 12:00:00', $tz),
-
- ], $dates);
-
- $this->assertEquals([
- 'baseEvent',
- 'Override!',
- 'baseEvent',
- ], $summaries);
-
- }
-
- /**
- * @depends testValues
- */
- function testOverridenEventNoValuesExpected() {
-
- $vcal = new VCalendar();
- $ev1 = $vcal->createComponent('VEVENT');
-
- $ev1->UID = 'overridden';
- $ev1->RRULE = 'FREQ=WEEKLY;COUNT=3';
- $ev1->DTSTART = '20120124T120000Z';
- $ev1->SUMMARY = 'baseEvent';
-
- $vcal->add($ev1);
-
- // ev2 overrides an event, and puts it 6 days earlier instead.
- $ev2 = $vcal->createComponent('VEVENT');
- $ev2->UID = 'overridden';
- $ev2->{'RECURRENCE-ID'} = '20120131T120000Z';
- $ev2->DTSTART = '20120125T120000Z';
- $ev2->SUMMARY = 'Override!';
-
- $vcal->add($ev2);
-
- $it = new EventIterator($vcal, 'overridden');
-
- $dates = [];
- $summaries = [];
-
- // The reported problem was specifically related to the VCALENDAR
- // expansion. In this parcitular case, we had to forward to the 28th of
- // january.
- $it->fastForward(new DateTimeImmutable('2012-01-28 23:00:00'));
-
- // We stop the loop when it hits the 6th of februari. Normally this
- // iterator would hit 24, 25 (overriden from 31) and 7 feb but because
- // we 'filter' from the 28th till the 6th, we should get 0 results.
- while ($it->valid() && $it->getDTStart() < new DateTimeImmutable('2012-02-06 23:00:00')) {
-
- $dates[] = $it->getDTStart();
- $summaries[] = (string)$it->getEventObject()->SUMMARY;
- $it->next();
-
- }
-
- $this->assertEquals([], $dates);
- $this->assertEquals([], $summaries);
-
- }
-
- /**
- * @depends testValues
- */
- function testRDATE() {
-
- $vcal = new VCalendar();
- $ev = $vcal->createComponent('VEVENT');
-
- $ev->UID = 'bla';
- $ev->RDATE = [
- new DateTimeImmutable('2014-08-07', new DateTimeZone('UTC')),
- new DateTimeImmutable('2014-08-08', new DateTimeZone('UTC')),
- ];
- $dtStart = $vcal->createProperty('DTSTART');
- $dtStart->setDateTime(new DateTimeImmutable('2011-10-07', new DateTimeZone('UTC')));
-
- $ev->add($dtStart);
-
- $vcal->add($ev);
-
- $it = new EventIterator($vcal, $ev->UID);
-
- // Max is to prevent overflow
- $max = 12;
- $result = [];
- foreach ($it as $item) {
-
- $result[] = $item;
- $max--;
-
- if (!$max) break;
-
- }
-
- $tz = new DateTimeZone('UTC');
-
- $this->assertEquals(
- [
- new DateTimeImmutable('2011-10-07', $tz),
- new DateTimeImmutable('2014-08-07', $tz),
- new DateTimeImmutable('2014-08-08', $tz),
- ],
- $result
- );
-
- }
-
- /**
- * @depends testValues
- * @expectedException \InvalidArgumentException
- */
- function testNoMasterBadUID() {
-
- $vcal = new VCalendar();
- // ev2 overrides an event, and puts it on 2pm instead.
- $ev2 = $vcal->createComponent('VEVENT');
- $ev2->UID = 'overridden';
- $ev2->{'RECURRENCE-ID'} = '20120110T120000Z';
- $ev2->DTSTART = '20120110T140000Z';
- $ev2->SUMMARY = 'Event 2';
-
- $vcal->add($ev2);
-
- // ev3 overrides an event, and puts it 2 days and 2 hours later
- $ev3 = $vcal->createComponent('VEVENT');
- $ev3->UID = 'overridden';
- $ev3->{'RECURRENCE-ID'} = '20120113T120000Z';
- $ev3->DTSTART = '20120115T140000Z';
- $ev3->SUMMARY = 'Event 3';
-
- $vcal->add($ev3);
-
- $it = new EventIterator($vcal, 'broken');
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/MaxInstancesTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/MaxInstancesTest.php
deleted file mode 100644
index 1e94032a308..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/MaxInstancesTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-expand(new DateTime('2014-08-01'), new DateTime('2014-09-01'));
-
- } finally {
- Settings::$maxRecurrences = $temp;
- }
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/MissingOverriddenTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/MissingOverriddenTest.php
deleted file mode 100644
index fc8c518dcda..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/MissingOverriddenTest.php
+++ /dev/null
@@ -1,62 +0,0 @@
-assertInstanceOf('Sabre\\VObject\\Component\\VCalendar', $vcal);
-
- $vcal = $vcal->expand(new DateTime('2011-01-01'), new DateTime('2015-01-01'));
-
- $output = <<assertVObjectEqualsVObject($output, $vcal);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/NoInstancesTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/NoInstancesTest.php
deleted file mode 100644
index 84c7ec13e61..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/NoInstancesTest.php
+++ /dev/null
@@ -1,40 +0,0 @@
-assertInstanceOf('Sabre\\VObject\\Component\\VCalendar', $vcal);
-
- $it = new EventIterator($vcal, 'foo');
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/OverrideFirstEventTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/OverrideFirstEventTest.php
deleted file mode 100644
index 78c0782c877..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/OverrideFirstEventTest.php
+++ /dev/null
@@ -1,121 +0,0 @@
-expand(new DateTime('2014-08-01'), new DateTime('2014-09-01'));
-
- $expected = <<assertVObjectEqualsVObject(
- $expected,
- $vcal
- );
-
-
- }
-
- function testRemoveFirstEvent() {
-
- $input = <<expand(new DateTime('2014-08-01'), new DateTime('2014-08-19'));
-
- $expected = <<assertVObjectEqualsVObject(
- $expected,
- $vcal
- );
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/SameDateForRecurringEventsTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/SameDateForRecurringEventsTest.php
deleted file mode 100644
index b89f25aaa49..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/EventIterator/SameDateForRecurringEventsTest.php
+++ /dev/null
@@ -1,55 +0,0 @@
-getComponents());
-
- $this->assertEquals(4, iterator_count($eventIterator), 'in ICS 4 events');
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/RDateIteratorTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/RDateIteratorTest.php
deleted file mode 100644
index e2852dc6986..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/RDateIteratorTest.php
+++ /dev/null
@@ -1,78 +0,0 @@
-assertEquals(
- $expected,
- iterator_to_array($it)
- );
-
- $this->assertFalse($it->isInfinite());
-
- }
-
- function testTimezone() {
-
- $tz = new DateTimeZone('Europe/Berlin');
- $it = new RDateIterator('20140901T000000,20141001T000000', new DateTimeImmutable('2014-08-01 00:00:00', $tz));
-
- $expected = [
- new DateTimeImmutable('2014-08-01 00:00:00', $tz),
- new DateTimeImmutable('2014-09-01 00:00:00', $tz),
- new DateTimeImmutable('2014-10-01 00:00:00', $tz),
- ];
-
- $this->assertEquals(
- $expected,
- iterator_to_array($it)
- );
-
-
- $this->assertFalse($it->isInfinite());
-
- }
-
-
- function testFastForward() {
-
- $utc = new DateTimeZone('UTC');
- $it = new RDateIterator('20140901T000000Z,20141001T000000Z', new DateTimeImmutable('2014-08-01 00:00:00', $utc));
-
- $it->fastForward(new DateTimeImmutable('2014-08-15 00:00:00'));
-
- $result = [];
- while ($it->valid()) {
- $result[] = $it->current();
- $it->next();
- }
-
- $expected = [
- new DateTimeImmutable('2014-09-01 00:00:00', $utc),
- new DateTimeImmutable('2014-10-01 00:00:00', $utc),
- ];
-
- $this->assertEquals(
- $expected,
- $result
- );
-
- $this->assertFalse($it->isInfinite());
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/RRuleIteratorTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/RRuleIteratorTest.php
deleted file mode 100644
index 84649f41f37..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Recur/RRuleIteratorTest.php
+++ /dev/null
@@ -1,995 +0,0 @@
-parse(
- 'FREQ=HOURLY;INTERVAL=3;COUNT=12',
- '2011-10-07 12:00:00',
- [
- '2011-10-07 12:00:00',
- '2011-10-07 15:00:00',
- '2011-10-07 18:00:00',
- '2011-10-07 21:00:00',
- '2011-10-08 00:00:00',
- '2011-10-08 03:00:00',
- '2011-10-08 06:00:00',
- '2011-10-08 09:00:00',
- '2011-10-08 12:00:00',
- '2011-10-08 15:00:00',
- '2011-10-08 18:00:00',
- '2011-10-08 21:00:00',
- ]
- );
-
- }
-
- function testDaily() {
-
- $this->parse(
- 'FREQ=DAILY;INTERVAL=3;UNTIL=20111025T000000Z',
- '2011-10-07',
- [
- '2011-10-07 00:00:00',
- '2011-10-10 00:00:00',
- '2011-10-13 00:00:00',
- '2011-10-16 00:00:00',
- '2011-10-19 00:00:00',
- '2011-10-22 00:00:00',
- '2011-10-25 00:00:00',
- ]
- );
-
- }
-
- function testDailyByDayByHour() {
-
- $this->parse(
- 'FREQ=DAILY;BYDAY=SA,SU;BYHOUR=6,7',
- '2011-10-08 06:00:00',
- [
- '2011-10-08 06:00:00',
- '2011-10-08 07:00:00',
- '2011-10-09 06:00:00',
- '2011-10-09 07:00:00',
- '2011-10-15 06:00:00',
- '2011-10-15 07:00:00',
- '2011-10-16 06:00:00',
- '2011-10-16 07:00:00',
- '2011-10-22 06:00:00',
- '2011-10-22 07:00:00',
- '2011-10-23 06:00:00',
- '2011-10-23 07:00:00',
- ]
- );
-
- }
-
- function testDailyByHour() {
-
- $this->parse(
- 'FREQ=DAILY;INTERVAL=2;BYHOUR=10,11,12,13,14,15',
- '2012-10-11 12:00:00',
- [
- '2012-10-11 12:00:00',
- '2012-10-11 13:00:00',
- '2012-10-11 14:00:00',
- '2012-10-11 15:00:00',
- '2012-10-13 10:00:00',
- '2012-10-13 11:00:00',
- '2012-10-13 12:00:00',
- '2012-10-13 13:00:00',
- '2012-10-13 14:00:00',
- '2012-10-13 15:00:00',
- '2012-10-15 10:00:00',
- '2012-10-15 11:00:00',
- ]
- );
-
- }
-
- function testDailyByDay() {
-
- $this->parse(
- 'FREQ=DAILY;INTERVAL=2;BYDAY=TU,WE,FR',
- '2011-10-07 12:00:00',
- [
- '2011-10-07 12:00:00',
- '2011-10-11 12:00:00',
- '2011-10-19 12:00:00',
- '2011-10-21 12:00:00',
- '2011-10-25 12:00:00',
- '2011-11-02 12:00:00',
- '2011-11-04 12:00:00',
- '2011-11-08 12:00:00',
- '2011-11-16 12:00:00',
- '2011-11-18 12:00:00',
- '2011-11-22 12:00:00',
- '2011-11-30 12:00:00',
- ]
- );
-
- }
-
- function testDailyCount() {
-
- $this->parse(
- 'FREQ=DAILY;COUNT=5',
- '2014-08-01 18:03:00',
- [
- '2014-08-01 18:03:00',
- '2014-08-02 18:03:00',
- '2014-08-03 18:03:00',
- '2014-08-04 18:03:00',
- '2014-08-05 18:03:00',
- ]
- );
-
- }
-
- function testDailyByMonth() {
-
- $this->parse(
- 'FREQ=DAILY;BYMONTH=9,10;BYDAY=SU',
- '2007-10-04 16:00:00',
- [
- '2013-09-29 16:00:00',
- '2013-10-06 16:00:00',
- '2013-10-13 16:00:00',
- '2013-10-20 16:00:00',
- '2013-10-27 16:00:00',
- '2014-09-07 16:00:00'
- ],
- '2013-09-28'
- );
-
- }
-
- function testWeekly() {
-
- $this->parse(
- 'FREQ=WEEKLY;INTERVAL=2;COUNT=10',
- '2011-10-07 00:00:00',
- [
- '2011-10-07 00:00:00',
- '2011-10-21 00:00:00',
- '2011-11-04 00:00:00',
- '2011-11-18 00:00:00',
- '2011-12-02 00:00:00',
- '2011-12-16 00:00:00',
- '2011-12-30 00:00:00',
- '2012-01-13 00:00:00',
- '2012-01-27 00:00:00',
- '2012-02-10 00:00:00',
- ]
- );
-
- }
-
- function testWeeklyByDay() {
-
- $this->parse(
- 'FREQ=WEEKLY;INTERVAL=1;COUNT=4;BYDAY=MO;WKST=SA',
- '2014-08-01 00:00:00',
- [
- '2014-08-01 00:00:00',
- '2014-08-04 00:00:00',
- '2014-08-11 00:00:00',
- '2014-08-18 00:00:00',
- ]
- );
-
- }
-
- function testWeeklyByDay2() {
-
- $this->parse(
- 'FREQ=WEEKLY;INTERVAL=2;BYDAY=TU,WE,FR;WKST=SU',
- '2011-10-07 00:00:00',
- [
- '2011-10-07 00:00:00',
- '2011-10-18 00:00:00',
- '2011-10-19 00:00:00',
- '2011-10-21 00:00:00',
- '2011-11-01 00:00:00',
- '2011-11-02 00:00:00',
- '2011-11-04 00:00:00',
- '2011-11-15 00:00:00',
- '2011-11-16 00:00:00',
- '2011-11-18 00:00:00',
- '2011-11-29 00:00:00',
- '2011-11-30 00:00:00',
- ]
- );
-
- }
-
- function testWeeklyByDayByHour() {
-
- $this->parse(
- 'FREQ=WEEKLY;INTERVAL=2;BYDAY=TU,WE,FR;WKST=MO;BYHOUR=8,9,10',
- '2011-10-07 08:00:00',
- [
- '2011-10-07 08:00:00',
- '2011-10-07 09:00:00',
- '2011-10-07 10:00:00',
- '2011-10-18 08:00:00',
- '2011-10-18 09:00:00',
- '2011-10-18 10:00:00',
- '2011-10-19 08:00:00',
- '2011-10-19 09:00:00',
- '2011-10-19 10:00:00',
- '2011-10-21 08:00:00',
- '2011-10-21 09:00:00',
- '2011-10-21 10:00:00',
- '2011-11-01 08:00:00',
- '2011-11-01 09:00:00',
- '2011-11-01 10:00:00',
- ]
- );
-
- }
-
- function testWeeklyByDaySpecificHour() {
-
- $this->parse(
- 'FREQ=WEEKLY;INTERVAL=2;BYDAY=TU,WE,FR;WKST=SU',
- '2011-10-07 18:00:00',
- [
- '2011-10-07 18:00:00',
- '2011-10-18 18:00:00',
- '2011-10-19 18:00:00',
- '2011-10-21 18:00:00',
- '2011-11-01 18:00:00',
- '2011-11-02 18:00:00',
- '2011-11-04 18:00:00',
- '2011-11-15 18:00:00',
- '2011-11-16 18:00:00',
- '2011-11-18 18:00:00',
- '2011-11-29 18:00:00',
- '2011-11-30 18:00:00',
- ]
- );
-
- }
-
- function testMonthly() {
-
- $this->parse(
- 'FREQ=MONTHLY;INTERVAL=3;COUNT=5',
- '2011-12-05 00:00:00',
- [
- '2011-12-05 00:00:00',
- '2012-03-05 00:00:00',
- '2012-06-05 00:00:00',
- '2012-09-05 00:00:00',
- '2012-12-05 00:00:00',
- ]
- );
-
- }
-
- function testMonlthyEndOfMonth() {
-
- $this->parse(
- 'FREQ=MONTHLY;INTERVAL=2;COUNT=12',
- '2011-12-31 00:00:00',
- [
- '2011-12-31 00:00:00',
- '2012-08-31 00:00:00',
- '2012-10-31 00:00:00',
- '2012-12-31 00:00:00',
- '2013-08-31 00:00:00',
- '2013-10-31 00:00:00',
- '2013-12-31 00:00:00',
- '2014-08-31 00:00:00',
- '2014-10-31 00:00:00',
- '2014-12-31 00:00:00',
- '2015-08-31 00:00:00',
- '2015-10-31 00:00:00',
- ]
- );
-
- }
-
- function testMonthlyByMonthDay() {
-
- $this->parse(
- 'FREQ=MONTHLY;INTERVAL=5;COUNT=9;BYMONTHDAY=1,31,-7',
- '2011-01-01 00:00:00',
- [
- '2011-01-01 00:00:00',
- '2011-01-25 00:00:00',
- '2011-01-31 00:00:00',
- '2011-06-01 00:00:00',
- '2011-06-24 00:00:00',
- '2011-11-01 00:00:00',
- '2011-11-24 00:00:00',
- '2012-04-01 00:00:00',
- '2012-04-24 00:00:00',
- ]
- );
-
- }
-
- function testMonthlyByDay() {
-
- $this->parse(
- 'FREQ=MONTHLY;INTERVAL=2;COUNT=16;BYDAY=MO,-2TU,+1WE,3TH',
- '2011-01-03 00:00:00',
- [
- '2011-01-03 00:00:00',
- '2011-01-05 00:00:00',
- '2011-01-10 00:00:00',
- '2011-01-17 00:00:00',
- '2011-01-18 00:00:00',
- '2011-01-20 00:00:00',
- '2011-01-24 00:00:00',
- '2011-01-31 00:00:00',
- '2011-03-02 00:00:00',
- '2011-03-07 00:00:00',
- '2011-03-14 00:00:00',
- '2011-03-17 00:00:00',
- '2011-03-21 00:00:00',
- '2011-03-22 00:00:00',
- '2011-03-28 00:00:00',
- '2011-05-02 00:00:00',
- ]
- );
-
- }
-
- function testMonthlyByDayByMonthDay() {
-
- $this->parse(
- 'FREQ=MONTHLY;COUNT=10;BYDAY=MO;BYMONTHDAY=1',
- '2011-08-01 00:00:00',
- [
- '2011-08-01 00:00:00',
- '2012-10-01 00:00:00',
- '2013-04-01 00:00:00',
- '2013-07-01 00:00:00',
- '2014-09-01 00:00:00',
- '2014-12-01 00:00:00',
- '2015-06-01 00:00:00',
- '2016-02-01 00:00:00',
- '2016-08-01 00:00:00',
- '2017-05-01 00:00:00',
- ]
- );
-
- }
-
- function testMonthlyByDayBySetPos() {
-
- $this->parse(
- 'FREQ=MONTHLY;COUNT=10;BYDAY=MO,TU,WE,TH,FR;BYSETPOS=1,-1',
- '2011-01-03 00:00:00',
- [
- '2011-01-03 00:00:00',
- '2011-01-31 00:00:00',
- '2011-02-01 00:00:00',
- '2011-02-28 00:00:00',
- '2011-03-01 00:00:00',
- '2011-03-31 00:00:00',
- '2011-04-01 00:00:00',
- '2011-04-29 00:00:00',
- '2011-05-02 00:00:00',
- '2011-05-31 00:00:00',
- ]
- );
-
- }
-
- function testYearly() {
-
- $this->parse(
- 'FREQ=YEARLY;COUNT=10;INTERVAL=3',
- '2011-01-01 00:00:00',
- [
- '2011-01-01 00:00:00',
- '2014-01-01 00:00:00',
- '2017-01-01 00:00:00',
- '2020-01-01 00:00:00',
- '2023-01-01 00:00:00',
- '2026-01-01 00:00:00',
- '2029-01-01 00:00:00',
- '2032-01-01 00:00:00',
- '2035-01-01 00:00:00',
- '2038-01-01 00:00:00',
- ]
- );
- }
-
- function testYearlyLeapYear() {
-
- $this->parse(
- 'FREQ=YEARLY;COUNT=3',
- '2012-02-29 00:00:00',
- [
- '2012-02-29 00:00:00',
- '2016-02-29 00:00:00',
- '2020-02-29 00:00:00',
- ]
- );
- }
-
- function testYearlyByMonth() {
-
- $this->parse(
- 'FREQ=YEARLY;COUNT=8;INTERVAL=4;BYMONTH=4,10',
- '2011-04-07 00:00:00',
- [
- '2011-04-07 00:00:00',
- '2011-10-07 00:00:00',
- '2015-04-07 00:00:00',
- '2015-10-07 00:00:00',
- '2019-04-07 00:00:00',
- '2019-10-07 00:00:00',
- '2023-04-07 00:00:00',
- '2023-10-07 00:00:00',
- ]
- );
-
- }
-
- /**
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testYearlyByMonthInvalidValue1() {
-
- $this->parse(
- 'FREQ=YEARLY;COUNT=6;BYMONTHDAY=24;BYMONTH=0',
- '2011-04-07 00:00:00',
- []
- );
-
- }
-
- /**
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testYearlyByMonthInvalidValue2() {
-
- $this->parse(
- 'FREQ=YEARLY;COUNT=6;BYMONTHDAY=24;BYMONTH=bla',
- '2011-04-07 00:00:00',
- []
- );
-
- }
-
- /**
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testYearlyByMonthManyInvalidValues() {
-
- $this->parse(
- 'FREQ=YEARLY;COUNT=6;BYMONTHDAY=24;BYMONTH=0,bla',
- '2011-04-07 00:00:00',
- []
- );
-
- }
-
- /**
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testYearlyByMonthEmptyValue() {
-
- $this->parse(
- 'FREQ=YEARLY;COUNT=6;BYMONTHDAY=24;BYMONTH=',
- '2011-04-07 00:00:00',
- []
- );
-
- }
-
- function testYearlyByMonthByDay() {
-
- $this->parse(
- 'FREQ=YEARLY;COUNT=8;INTERVAL=5;BYMONTH=4,10;BYDAY=1MO,-1SU',
- '2011-04-04 00:00:00',
- [
- '2011-04-04 00:00:00',
- '2011-04-24 00:00:00',
- '2011-10-03 00:00:00',
- '2011-10-30 00:00:00',
- '2016-04-04 00:00:00',
- '2016-04-24 00:00:00',
- '2016-10-03 00:00:00',
- '2016-10-30 00:00:00',
- ]
- );
-
- }
-
- function testYearlyByYearDay() {
-
- $this->parse(
- 'FREQ=YEARLY;COUNT=7;INTERVAL=2;BYYEARDAY=190',
- '2011-07-10 03:07:00',
- [
- '2011-07-10 03:07:00',
- '2013-07-10 03:07:00',
- '2015-07-10 03:07:00',
- '2017-07-10 03:07:00',
- '2019-07-10 03:07:00',
- '2021-07-10 03:07:00',
- '2023-07-10 03:07:00',
- ]
- );
-
- }
-
- function testYearlyByYearDayMultiple() {
-
- $this->parse(
- 'FREQ=YEARLY;COUNT=8;INTERVAL=3;BYYEARDAY=190,301',
- '2011-07-10 14:53:11',
- [
- '2011-07-10 14:53:11',
- '2011-10-29 14:53:11',
- '2014-07-10 14:53:11',
- '2014-10-29 14:53:11',
- '2017-07-10 14:53:11',
- '2017-10-29 14:53:11',
- '2020-07-09 14:53:11',
- '2020-10-28 14:53:11',
- ]
- );
-
- }
-
- function testYearlyByYearDayByDay() {
-
- $this->parse(
- 'FREQ=YEARLY;COUNT=6;BYYEARDAY=97;BYDAY=SA',
- '2001-04-07 14:53:11',
- [
- '2001-04-07 14:53:11',
- '2006-04-08 14:53:11',
- '2012-04-07 14:53:11',
- '2017-04-08 14:53:11',
- '2023-04-08 14:53:11',
- '2034-04-08 14:53:11',
- ]
- );
-
- }
-
- function testYearlyByYearDayNegative() {
-
- $this->parse(
- 'FREQ=YEARLY;COUNT=8;BYYEARDAY=-97,-5',
- '2001-09-26 14:53:11',
- [
- '2001-09-26 14:53:11',
- '2001-12-27 14:53:11',
- '2002-09-26 14:53:11',
- '2002-12-27 14:53:11',
- '2003-09-26 14:53:11',
- '2003-12-27 14:53:11',
- '2004-09-26 14:53:11',
- '2004-12-27 14:53:11',
- ]
- );
-
- }
-
- /**
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testYearlyByYearDayInvalid390() {
-
- $this->parse(
- 'FREQ=YEARLY;COUNT=8;INTERVAL=4;BYYEARDAY=390',
- '2011-04-07 00:00:00',
- [
- ]
- );
-
- }
-
- /**
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testYearlyByYearDayInvalid0() {
-
- $this->parse(
- 'FREQ=YEARLY;COUNT=8;INTERVAL=4;BYYEARDAY=0',
- '2011-04-07 00:00:00',
- [
- ]
- );
-
- }
-
- function testFastForward() {
-
- // The idea is that we're fast-forwarding too far in the future, so
- // there will be no results left.
- $this->parse(
- 'FREQ=YEARLY;COUNT=8;INTERVAL=5;BYMONTH=4,10;BYDAY=1MO,-1SU',
- '2011-04-04 00:00:00',
- [],
- '2020-05-05 00:00:00'
- );
-
- }
-
- /**
- * The bug that was in the
- * system before would fail on the 5th tuesday of the month, if the 5th
- * tuesday did not exist.
- *
- * A pretty slow test. Had to be marked as 'medium' for phpunit to not die
- * after 1 second. Would be good to optimize later.
- *
- * @medium
- */
- function testFifthTuesdayProblem() {
-
- $this->parse(
- 'FREQ=MONTHLY;INTERVAL=1;UNTIL=20071030T035959Z;BYDAY=5TU',
- '2007-10-04 14:46:42',
- [
- '2007-10-04 14:46:42',
- ]
- );
-
- }
-
- /**
- * This bug came from a Fruux customer. This would result in a never-ending
- * request.
- */
- function testFastFowardTooFar() {
-
- $this->parse(
- 'FREQ=WEEKLY;BYDAY=MO;UNTIL=20090704T205959Z;INTERVAL=1',
- '2009-04-20 18:00:00',
- [
- '2009-04-20 18:00:00',
- '2009-04-27 18:00:00',
- '2009-05-04 18:00:00',
- '2009-05-11 18:00:00',
- '2009-05-18 18:00:00',
- '2009-05-25 18:00:00',
- '2009-06-01 18:00:00',
- '2009-06-08 18:00:00',
- '2009-06-15 18:00:00',
- '2009-06-22 18:00:00',
- '2009-06-29 18:00:00',
- ]
- );
-
- }
-
- function testValidByWeekNo() {
-
- $this->parse(
- 'FREQ=YEARLY;BYWEEKNO=20;BYDAY=TU',
- '2011-02-07 00:00:00',
- [
- '2011-02-07 00:00:00',
- '2011-05-17 00:00:00',
- '2012-05-15 00:00:00',
- '2013-05-14 00:00:00',
- '2014-05-13 00:00:00',
- '2015-05-12 00:00:00',
- '2016-05-17 00:00:00',
- '2017-05-16 00:00:00',
- '2018-05-15 00:00:00',
- '2019-05-14 00:00:00',
- '2020-05-12 00:00:00',
- '2021-05-18 00:00:00',
- ]
- );
-
- }
-
- function testNegativeValidByWeekNo() {
-
- $this->parse(
- 'FREQ=YEARLY;BYWEEKNO=-20;BYDAY=TU,FR',
- '2011-09-02 00:00:00',
- [
- '2011-09-02 00:00:00',
- '2012-08-07 00:00:00',
- '2012-08-10 00:00:00',
- '2013-08-06 00:00:00',
- '2013-08-09 00:00:00',
- '2014-08-05 00:00:00',
- '2014-08-08 00:00:00',
- '2015-08-11 00:00:00',
- '2015-08-14 00:00:00',
- '2016-08-09 00:00:00',
- '2016-08-12 00:00:00',
- '2017-08-08 00:00:00',
- ]
- );
-
- }
-
- function testTwoValidByWeekNo() {
-
- $this->parse(
- 'FREQ=YEARLY;BYWEEKNO=20;BYDAY=TU,FR',
- '2011-09-07 09:00:00',
- [
- '2011-09-07 09:00:00',
- '2012-05-15 09:00:00',
- '2012-05-18 09:00:00',
- '2013-05-14 09:00:00',
- '2013-05-17 09:00:00',
- '2014-05-13 09:00:00',
- '2014-05-16 09:00:00',
- '2015-05-12 09:00:00',
- '2015-05-15 09:00:00',
- '2016-05-17 09:00:00',
- '2016-05-20 09:00:00',
- '2017-05-16 09:00:00',
- ]
- );
-
- }
-
- function testValidByWeekNoByDayDefault() {
-
- $this->parse(
- 'FREQ=YEARLY;BYWEEKNO=20',
- '2011-05-16 00:00:00',
- [
- '2011-05-16 00:00:00',
- '2012-05-14 00:00:00',
- '2013-05-13 00:00:00',
- '2014-05-12 00:00:00',
- '2015-05-11 00:00:00',
- '2016-05-16 00:00:00',
- '2017-05-15 00:00:00',
- '2018-05-14 00:00:00',
- '2019-05-13 00:00:00',
- '2020-05-11 00:00:00',
- '2021-05-17 00:00:00',
- '2022-05-16 00:00:00',
- ]
- );
-
- }
-
- function testMultipleValidByWeekNo() {
-
- $this->parse(
- 'FREQ=YEARLY;BYWEEKNO=20,50;BYDAY=TU,FR',
- '2011-01-16 00:00:00',
- [
- '2011-01-16 00:00:00',
- '2011-05-17 00:00:00',
- '2011-05-20 00:00:00',
- '2011-12-13 00:00:00',
- '2011-12-16 00:00:00',
- '2012-05-15 00:00:00',
- '2012-05-18 00:00:00',
- '2012-12-11 00:00:00',
- '2012-12-14 00:00:00',
- '2013-05-14 00:00:00',
- '2013-05-17 00:00:00',
- '2013-12-10 00:00:00',
- ]
- );
-
- }
-
- /**
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testInvalidByWeekNo() {
-
- $this->parse(
- 'FREQ=YEARLY;BYWEEKNO=54',
- '2011-05-16 00:00:00',
- [
- ]
- );
-
- }
-
- /**
- * This also at one point caused an infinite loop. We're keeping the test.
- */
- function testYearlyByMonthLoop() {
-
- $this->parse(
- 'FREQ=YEARLY;INTERVAL=1;UNTIL=20120203T225959Z;BYMONTH=2;BYSETPOS=1;BYDAY=SU,MO,TU,WE,TH,FR,SA',
- '2012-01-01 15:45:00',
- [
- '2012-02-01 15:45:00',
- ],
- '2012-01-29 23:00:00'
- );
-
-
- }
-
- /**
- * Something, somewhere produced an ics with an interval set to 0. Because
- * this means we increase the current day (or week, month) by 0, this also
- * results in an infinite loop.
- *
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testZeroInterval() {
-
- $this->parse(
- 'FREQ=YEARLY;INTERVAL=0',
- '2012-08-24 14:57:00',
- [],
- '2013-01-01 23:00:00'
- );
-
- }
-
- /**
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testInvalidFreq() {
-
- $this->parse(
- 'FREQ=SMONTHLY;INTERVAL=3;UNTIL=20111025T000000Z',
- '2011-10-07',
- []
- );
-
- }
-
- /**
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testByDayBadOffset() {
-
- $this->parse(
- 'FREQ=WEEKLY;INTERVAL=1;COUNT=4;BYDAY=0MO;WKST=SA',
- '2014-08-01 00:00:00',
- []
- );
-
- }
-
- function testUntilBeginHasTimezone() {
-
- $this->parse(
- 'FREQ=WEEKLY;UNTIL=20131118T183000',
- '2013-09-23 18:30:00',
- [
- '2013-09-23 18:30:00',
- '2013-09-30 18:30:00',
- '2013-10-07 18:30:00',
- '2013-10-14 18:30:00',
- '2013-10-21 18:30:00',
- '2013-10-28 18:30:00',
- '2013-11-04 18:30:00',
- '2013-11-11 18:30:00',
- '2013-11-18 18:30:00',
- ],
- null,
- 'America/New_York'
- );
-
- }
-
- function testUntilBeforeDtStart() {
-
- $this->parse(
- 'FREQ=DAILY;UNTIL=20140101T000000Z',
- '2014-08-02 00:15:00',
- [
- '2014-08-02 00:15:00',
- ]
- );
-
- }
-
- function testIgnoredStuff() {
-
- $this->parse(
- 'FREQ=DAILY;BYSECOND=1;BYMINUTE=1;BYYEARDAY=1;BYWEEKNO=1;COUNT=2',
- '2014-08-02 00:15:00',
- [
- '2014-08-02 00:15:00',
- '2014-08-03 00:15:00',
- ]
- );
-
- }
-
- function testMinusFifthThursday() {
-
- $this->parse(
- 'FREQ=MONTHLY;BYDAY=-4TH,-5TH;COUNT=4',
- '2015-01-01 00:15:00',
- [
- '2015-01-01 00:15:00',
- '2015-01-08 00:15:00',
- '2015-02-05 00:15:00',
- '2015-03-05 00:15:00'
- ]
- );
-
- }
-
- /**
- * @expectedException \Sabre\VObject\InvalidDataException
- */
- function testUnsupportedPart() {
-
- $this->parse(
- 'FREQ=DAILY;BYWODAN=1',
- '2014-08-02 00:15:00',
- []
- );
-
- }
-
- function testIteratorFunctions() {
-
- $parser = new RRuleIterator('FREQ=DAILY', new DateTime('2014-08-02 00:00:13'));
- $parser->next();
- $this->assertEquals(
- new DateTime('2014-08-03 00:00:13'),
- $parser->current()
- );
- $this->assertEquals(
- 1,
- $parser->key()
- );
-
- $parser->rewind();
-
- $this->assertEquals(
- new DateTime('2014-08-02 00:00:13'),
- $parser->current()
- );
- $this->assertEquals(
- 0,
- $parser->key()
- );
-
- }
-
- function parse($rule, $start, $expected, $fastForward = null, $tz = 'UTC') {
-
- $dt = new DateTime($start, new DateTimeZone($tz));
- $parser = new RRuleIterator($rule, $dt);
-
- if ($fastForward) {
- $parser->fastForward(new DateTime($fastForward));
- }
-
- $result = [];
- while ($parser->valid()) {
-
- $item = $parser->current();
- $result[] = $item->format('Y-m-d H:i:s');
-
- if ($parser->isInfinite() && count($result) >= count($expected)) {
- break;
- }
- $parser->next();
-
- }
-
- $this->assertEquals(
- $expected,
- $result
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/RecurrenceIterator/UntilRespectsTimezoneTest.ics b/htdocs/includes/sabre/sabre/vobject/tests/VObject/RecurrenceIterator/UntilRespectsTimezoneTest.ics
deleted file mode 100644
index 1663c783d84..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/RecurrenceIterator/UntilRespectsTimezoneTest.ics
+++ /dev/null
@@ -1,39 +0,0 @@
-BEGIN:VCALENDAR
-VERSION:2.0
-X-WR-TIMEZONE:America/New_York
-PRODID:-//www.churchcommunitybuilder.com//Church Community Builder//EN
-CALSCALE:GREGORIAN
-METHOD:PUBLISH
-X-WR-CALNAME:Test Event
-BEGIN:VTIMEZONE
-TZID:America/New_York
-X-LIC-LOCATION:America/New_York
-BEGIN:DAYLIGHT
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-TZNAME:EDT
-DTSTART:19700308T020000
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=2SU
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-TZNAME:EST
-DTSTART:19701101T020000
-RRULE:FREQ=YEARLY;BYMONTH=11;BYDAY=1SU
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-UID:10621-1440@ccbchurch.com
-DTSTART;TZID=America/New_York:20130923T183000
-DTEND;TZID=America/New_York:20130923T203000
-DTSTAMP:20131216T170211
-RRULE:FREQ=WEEKLY;UNTIL=20131118T183000
-CREATED:20130423T161111
-DESCRIPTION:Test Event ending November 11, 2013
-LAST-MODIFIED:20131126T163428
-SEQUENCE:1387231331
-SUMMARY:Test
-TRANSP:OPAQUE
-END:VEVENT
-END:VCALENDAR
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/SlashRTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/SlashRTest.php
deleted file mode 100644
index 8e9389de162..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/SlashRTest.php
+++ /dev/null
@@ -1,20 +0,0 @@
-add('test', "abc\r\ndef");
- $this->assertEquals("TEST:abc\\ndef\r\n", $prop->serialize());
-
- }
-
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Splitter/ICalendarTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Splitter/ICalendarTest.php
deleted file mode 100644
index ccbd5c88191..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Splitter/ICalendarTest.php
+++ /dev/null
@@ -1,325 +0,0 @@
-version = VObject\Version::VERSION;
- }
-
- function createStream($data) {
-
- $stream = fopen('php://memory', 'r+');
- fwrite($stream, $data);
- rewind($stream);
- return $stream;
-
- }
-
- function testICalendarImportValidEvent() {
-
- $data = <<createStream($data);
-
- $objects = new ICalendar($tempFile);
-
- $return = "";
- while ($object = $objects->getNext()) {
- $return .= $object->serialize();
- }
- $this->assertEquals([], VObject\Reader::read($return)->validate());
- }
-
- /**
- * @expectedException Sabre\VObject\ParseException
- */
- function testICalendarImportWrongType() {
-
- $data = <<createStream($data);
-
- $objects = new ICalendar($tempFile);
-
- }
-
- function testICalendarImportEndOfData() {
- $data = <<createStream($data);
-
- $objects = new ICalendar($tempFile);
-
- $return = "";
- while ($object = $objects->getNext()) {
- $return .= $object->serialize();
- }
- $this->assertNull($object = $objects->getNext());
- }
-
- /**
- * @expectedException Sabre\VObject\ParseException
- */
- function testICalendarImportInvalidEvent() {
- $data = <<createStream($data);
- $objects = new ICalendar($tempFile);
-
- }
-
- function testICalendarImportMultipleValidEvents() {
-
- $event[] = <<createStream($data);
-
- $objects = new ICalendar($tempFile);
-
- $return = "";
- $i = 0;
- while ($object = $objects->getNext()) {
-
- $expected = <<version//EN
-CALSCALE:GREGORIAN
-$event[$i]
-END:VCALENDAR
-
-EOT;
-
- $return .= $object->serialize();
- $expected = str_replace("\n", "\r\n", $expected);
- $this->assertEquals($expected, $object->serialize());
- $i++;
- }
- $this->assertEquals([], VObject\Reader::read($return)->validate());
- }
-
- function testICalendarImportEventWithoutUID() {
-
- $data = <<version//EN
-CALSCALE:GREGORIAN
-BEGIN:VEVENT
-DTSTART:20140101T040000Z
-DTSTAMP:20140122T233226Z
-END:VEVENT
-END:VCALENDAR
-
-EOT;
- $tempFile = $this->createStream($data);
-
- $objects = new ICalendar($tempFile);
-
- $return = "";
- while ($object = $objects->getNext()) {
- $return .= $object->serialize();
- }
-
- $messages = VObject\Reader::read($return)->validate();
-
- if ($messages) {
- $messages = array_map(
- function($item) { return $item['message']; },
- $messages
- );
- $this->fail('Validation errors: ' . implode("\n", $messages));
- } else {
- $this->assertEquals([], $messages);
- }
- }
-
- function testICalendarImportMultipleVTIMEZONESAndMultipleValidEvents() {
-
- $timezones = <<createStream($data);
-
- $objects = new ICalendar($tempFile);
-
- $return = "";
- $i = 0;
- while ($object = $objects->getNext()) {
-
- $expected = <<version//EN
-CALSCALE:GREGORIAN
-$timezones
-$event[$i]
-END:VCALENDAR
-
-EOT;
- $expected = str_replace("\n", "\r\n", $expected);
-
- $this->assertEquals($expected, $object->serialize());
- $return .= $object->serialize();
- $i++;
-
- }
-
- $this->assertEquals([], VObject\Reader::read($return)->validate());
- }
-
- function testICalendarImportWithOutVTIMEZONES() {
-
- $data = <<createStream($data);
-
- $objects = new ICalendar($tempFile);
-
- $return = "";
- while ($object = $objects->getNext()) {
- $return .= $object->serialize();
- }
-
- $messages = VObject\Reader::read($return)->validate();
- $this->assertEquals([], $messages);
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Splitter/VCardTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/Splitter/VCardTest.php
deleted file mode 100644
index e19e2d8205e..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/Splitter/VCardTest.php
+++ /dev/null
@@ -1,193 +0,0 @@
-createStream($data);
-
- $objects = new VCard($tempFile);
-
- $count = 0;
- while ($objects->getNext()) {
- $count++;
- }
- $this->assertEquals(1, $count);
-
- }
-
- /**
- * @expectedException Sabre\VObject\ParseException
- */
- function testVCardImportWrongType() {
- $event[] = <<createStream($data);
-
- $splitter = new VCard($tempFile);
-
- while ($object = $splitter->getNext()) {
- }
-
- }
-
- function testVCardImportValidVCardsWithCategories() {
- $data = <<createStream($data);
-
- $splitter = new VCard($tempFile);
-
- $count = 0;
- while ($object = $splitter->getNext()) {
- $count++;
- }
- $this->assertEquals(4, $count);
-
- }
-
- function testVCardImportEndOfData() {
- $data = <<createStream($data);
-
- $objects = new VCard($tempFile);
- $object = $objects->getNext();
-
- $this->assertNull($objects->getNext());
-
-
- }
-
- /**
- * @expectedException \Sabre\VObject\ParseException
- */
- function testVCardImportCheckInvalidArgumentException() {
- $data = <<createStream($data);
-
- $objects = new VCard($tempFile);
- while ($objects->getNext()) { }
-
- }
-
- function testVCardImportMultipleValidVCards() {
- $data = <<createStream($data);
-
- $objects = new VCard($tempFile);
-
- $count = 0;
- while ($objects->getNext()) {
- $count++;
- }
- $this->assertEquals(2, $count);
-
- }
-
- function testImportMultipleSeparatedWithNewLines() {
- $data = <<createStream($data);
- $objects = new VCard($tempFile);
-
- $count = 0;
- while ($objects->getNext()) {
- $count++;
- }
- $this->assertEquals(2, $count);
- }
-
- function testVCardImportVCardWithoutUID() {
- $data = <<createStream($data);
-
- $objects = new VCard($tempFile);
-
- $count = 0;
- while ($objects->getNext()) {
- $count++;
- }
-
- $this->assertEquals(1, $count);
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/StringUtilTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/StringUtilTest.php
deleted file mode 100644
index 8e0bc483d15..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/StringUtilTest.php
+++ /dev/null
@@ -1,55 +0,0 @@
-assertEquals(false, $string);
-
- }
-
- function testIsUTF8() {
-
- $string = StringUtil::isUTF8('I 💚 SabreDAV');
-
- $this->assertEquals(true, $string);
-
- }
-
- function testUTF8ControlChar() {
-
- $string = StringUtil::isUTF8(chr(0x00));
-
- $this->assertEquals(false, $string);
-
- }
-
- function testConvertToUTF8nonUTF8() {
-
- $string = StringUtil::convertToUTF8(chr(0xbf));
-
- $this->assertEquals(utf8_encode(chr(0xbf)), $string);
-
- }
-
- function testConvertToUTF8IsUTF8() {
-
- $string = StringUtil::convertToUTF8('I 💚 SabreDAV');
-
- $this->assertEquals('I 💚 SabreDAV', $string);
-
- }
-
- function testConvertToUTF8ControlChar() {
-
- $string = StringUtil::convertToUTF8(chr(0x00));
-
- $this->assertEquals('', $string);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/TimeZoneUtilTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/TimeZoneUtilTest.php
deleted file mode 100644
index 8d8357dc7c2..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/TimeZoneUtilTest.php
+++ /dev/null
@@ -1,377 +0,0 @@
-assertInstanceOf('DateTimeZone', $tz);
- } catch (\Exception $e) {
- if (strpos($e->getMessage(), "Unknown or bad timezone") !== false) {
- $this->markTestSkipped($timezoneName . ' is not (yet) supported in this PHP version. Update pecl/timezonedb');
- } else {
- throw $e;
- }
-
- }
-
- }
-
- function getMapping() {
-
- TimeZoneUtil::loadTzMaps();
-
- // PHPUNit requires an array of arrays
- return array_map(
- function($value) {
- return [$value];
- },
- TimeZoneUtil::$map
- );
-
- }
-
- function testExchangeMap() {
-
- $vobj = <<assertEquals($ex->getName(), $tz->getName());
-
- }
-
- function testWetherMicrosoftIsStillInsane() {
-
- $vobj = <<assertEquals($ex->getName(), $tz->getName());
-
- }
-
- function testUnknownExchangeId() {
-
- $vobj = <<assertEquals($ex->getName(), $tz->getName());
-
- }
-
- function testWindowsTimeZone() {
-
- $tz = TimeZoneUtil::getTimeZone('Eastern Standard Time');
- $ex = new \DateTimeZone('America/New_York');
- $this->assertEquals($ex->getName(), $tz->getName());
-
- }
-
- /**
- * @dataProvider getPHPTimeZoneIdentifiers
- */
- function testTimeZoneIdentifiers($tzid) {
-
- $tz = TimeZoneUtil::getTimeZone($tzid);
- $ex = new \DateTimeZone($tzid);
-
- $this->assertEquals($ex->getName(), $tz->getName());
-
- }
-
- /**
- * @dataProvider getPHPTimeZoneBCIdentifiers
- */
- function testTimeZoneBCIdentifiers($tzid) {
-
- $tz = TimeZoneUtil::getTimeZone($tzid);
- $ex = new \DateTimeZone($tzid);
-
- $this->assertEquals($ex->getName(), $tz->getName());
-
- }
-
- function getPHPTimeZoneIdentifiers() {
-
- // PHPUNit requires an array of arrays
- return array_map(
- function($value) {
- return [$value];
- },
- \DateTimeZone::listIdentifiers()
- );
-
- }
-
- function getPHPTimeZoneBCIdentifiers() {
-
- // PHPUNit requires an array of arrays
- return array_map(
- function($value) {
- return [$value];
- },
- TimeZoneUtil::getIdentifiersBC()
- );
-
- }
-
- function testTimezoneOffset() {
-
- $tz = TimeZoneUtil::getTimeZone('GMT-0400', null, true);
-
- if (version_compare(PHP_VERSION, '5.5.10', '>=') && !defined('HHVM_VERSION')) {
- $ex = new \DateTimeZone('-04:00');
- } else {
- $ex = new \DateTimeZone('Etc/GMT-4');
- }
- $this->assertEquals($ex->getName(), $tz->getName());
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testTimezoneFail() {
-
- $tz = TimeZoneUtil::getTimeZone('FooBar', null, true);
-
- }
-
- function testFallBack() {
-
- $vobj = <<assertEquals($ex->getName(), $tz->getName());
-
- }
-
- function testLjubljanaBug() {
-
- $vobj = <<assertEquals($ex->getName(), $tz->getName());
-
- }
-
- function testWeirdSystemVLICs() {
-
-$vobj = <<assertEquals($ex->getName(), $tz->getName());
-
- }
-
-
- function testPrefixedOffsetExchangeIdentifier()
- {
- $tz = TimeZoneUtil::getTimeZone('(UTC-05:00) Eastern Time (US & Canada)');
- $ex = new \DateTimeZone('America/New_York');
- $this->assertEquals($ex->getName(), $tz->getName());
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/UUIDUtilTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/UUIDUtilTest.php
deleted file mode 100644
index d33a8794607..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/UUIDUtilTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-assertTrue(
- UUIDUtil::validateUUID('11111111-2222-3333-4444-555555555555')
- );
- $this->assertFalse(
- UUIDUtil::validateUUID(' 11111111-2222-3333-4444-555555555555')
- );
- $this->assertTrue(
- UUIDUtil::validateUUID('ffffffff-2222-3333-4444-555555555555')
- );
- $this->assertFalse(
- UUIDUtil::validateUUID('fffffffg-2222-3333-4444-555555555555')
- );
-
- }
-
- /**
- * @depends testValidateUUID
- */
- function testGetUUID() {
-
- $this->assertTrue(
- UUIDUtil::validateUUID(
- UUIDUtil::getUUID()
- )
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/VCard21Test.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/VCard21Test.php
deleted file mode 100644
index cede1eac59f..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/VCard21Test.php
+++ /dev/null
@@ -1,52 +0,0 @@
-serialize();
-
- $this->assertEquals($input, $output);
-
- }
-
- function testPropertyPadValueCount() {
-
- $input = <<serialize();
-
- $expected = <<assertEquals($expected, $output);
-
- }
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/VCardConverterTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/VCardConverterTest.php
deleted file mode 100644
index 77fc37d700f..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/VCardConverterTest.php
+++ /dev/null
@@ -1,533 +0,0 @@
-convert(Document::VCARD40);
-
- $this->assertVObjectEqualsVObject(
- $output,
- $vcard
- );
-
- }
-
- function testConvert40to40() {
-
- $input = <<convert(Document::VCARD40);
-
- $this->assertVObjectEqualsVObject(
- $output,
- $vcard
- );
-
- }
-
- function testConvert21to40() {
-
- $input = <<convert(Document::VCARD40);
-
- $this->assertVObjectEqualsVObject(
- $output,
- $vcard
- );
-
- }
-
- function testConvert30to30() {
-
- $input = <<convert(Document::VCARD30);
-
- $this->assertVObjectEqualsVObject(
- $output,
- $vcard
- );
-
- }
-
- function testConvert40to30() {
-
- $input = <<convert(Document::VCARD30);
-
- $this->assertVObjectEqualsVObject(
- $output,
- $vcard
- );
-
- }
-
- function testConvertGroupCard() {
-
- $input = <<convert(Document::VCARD40);
-
- $this->assertVObjectEqualsVObject(
- $output,
- $vcard
- );
-
- $input = $output;
- $output = <<convert(Document::VCARD30);
-
- $this->assertVObjectEqualsVObject(
- $output,
- $vcard
- );
-
- }
-
- function testBDAYConversion() {
-
- $input = <<convert(Document::VCARD40);
-
- $this->assertVObjectEqualsVObject(
- $output,
- $vcard
- );
-
- $input = $output;
- $output = <<convert(Document::VCARD30);
-
- $this->assertVObjectEqualsVObject(
- $output,
- $vcard
- );
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testUnknownSourceVCardVersion() {
-
- $input = <<convert(Document::VCARD40);
-
- }
-
- /**
- * @expectedException InvalidArgumentException
- */
- function testUnknownTargetVCardVersion() {
-
- $input = <<convert(Document::VCARD21);
-
- }
-
- function testConvertIndividualCard() {
-
- $input = <<convert(Document::VCARD30);
-
- $this->assertVObjectEqualsVObject(
- $output,
- $vcard
- );
-
- $input = $output;
- $output = <<convert(Document::VCARD40);
-
- $this->assertVObjectEqualsVObject(
- $output,
- $vcard
- );
-
- }
-
- function testAnniversary() {
-
- $input = <<!$_
-ITEM1.X-ANNIVERSARY;VALUE=DATE-AND-OR-TIME:20081210
-END:VCARD
-
-OUT;
-
- $vcard = Reader::read($input);
- $vcard = $vcard->convert(Document::VCARD30);
-
- $this->assertVObjectEqualsVObject(
- $output,
- $vcard
- );
-
- // Swapping input and output
- list(
- $input,
- $output
- ) = [
- $output,
- $input
- ];
-
- $vcard = Reader::read($input);
- $vcard = $vcard->convert(Document::VCARD40);
-
- $this->assertVObjectEqualsVObject(
- $output,
- $vcard
- );
-
- }
-
- function testMultipleAnniversaries() {
-
- $input = <<!$_
-ITEM1.X-ANNIVERSARY;VALUE=DATE-AND-OR-TIME:20081210
-ITEM2.X-ABDATE;VALUE=DATE-AND-OR-TIME:20091210
-ITEM2.X-ABLABEL:_$!!$_
-ITEM2.X-ANNIVERSARY;VALUE=DATE-AND-OR-TIME:20091210
-ITEM3.X-ABDATE;VALUE=DATE-AND-OR-TIME:20101210
-ITEM3.X-ABLABEL:_$!!$_
-ITEM3.X-ANNIVERSARY;VALUE=DATE-AND-OR-TIME:20101210
-END:VCARD
-
-OUT;
-
- $vcard = Reader::read($input);
- $vcard = $vcard->convert(Document::VCARD30);
-
- $this->assertVObjectEqualsVObject(
- $output,
- $vcard
- );
-
- // Swapping input and output
- list(
- $input,
- $output
- ) = [
- $output,
- $input
- ];
-
- $vcard = Reader::read($input);
- $vcard = $vcard->convert(Document::VCARD40);
-
- $this->assertVObjectEqualsVObject(
- $output,
- $vcard
- );
-
- }
-
- function testNoLabel() {
-
- $input = <<assertInstanceOf('Sabre\\VObject\\Component\\VCard', $vcard);
- $vcard = $vcard->convert(Document::VCARD40);
- $vcard = $vcard->serialize();
-
- $converted = Reader::read($vcard);
- $converted->validate();
-
- $version = Version::VERSION;
-
- $expected = <<assertEquals($expected, str_replace("\r", "", $vcard));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/VersionTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/VersionTest.php
deleted file mode 100644
index 956479bf2e6..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/VersionTest.php
+++ /dev/null
@@ -1,14 +0,0 @@
-assertEquals(-1, version_compare('2.0.0', $v));
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/WriterTest.php b/htdocs/includes/sabre/sabre/vobject/tests/VObject/WriterTest.php
deleted file mode 100644
index 800e13dd054..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/WriterTest.php
+++ /dev/null
@@ -1,41 +0,0 @@
-getComponent());
- $this->assertEquals("BEGIN:VCALENDAR\r\nEND:VCALENDAR\r\n", $result);
-
- }
-
- function testWriteToJson() {
-
- $result = Writer::writeJson($this->getComponent());
- $this->assertEquals('["vcalendar",[],[]]', $result);
-
- }
-
- function testWriteToXml() {
-
- $result = Writer::writeXml($this->getComponent());
- $this->assertEquals(
- '' . "\n" .
- '' . "\n" .
- ' ' . "\n",
- $result
- );
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/issue153.vcf b/htdocs/includes/sabre/sabre/vobject/tests/VObject/issue153.vcf
deleted file mode 100644
index 180949c5eb1..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/issue153.vcf
+++ /dev/null
@@ -1,352 +0,0 @@
-BEGIN:VCARD
-VERSION:3.0
-N:Benutzer;Test;;;
-FN:Test Benutzer
-PHOTO;BASE64:
- /9j/4AAQSkZJRgABAQAAAQABAAD/4QBYRXhpZgAATU0AKgAAAAgAAgESAAMAAAABAAEAAIdpAAQA
- AAABAAAAJgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAABQKADAAQAAAABAAABQAAAAAD/2wBD
- AAIBAQIBAQICAQICAgICAwUDAwMDAwYEBAMFBwYHBwcGBgYHCAsJBwgKCAYGCQ0JCgsLDAwMBwkN
- Dg0MDgsMDAv/2wBDAQICAgMCAwUDAwULCAYICwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsL
- CwsLCwsLCwsLCwsLCwsLCwsLCwv/wAARCAFAAUADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAA
- AAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKB
- kaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZn
- aGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT
- 1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcI
- CQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAV
- YnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6
- goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk
- 5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD8J7JbO8tYo1tIFCDLOVG5qfdaVZRwmSOFWzyA
- F4H1rLt5WViMhdp6HgmtKK8O3B+4Rhx6fSgBI9FtjaNN5aErwRjilSys7lFAt41xyTtqc2yJCVlY
- 7eqgGqv2jyLcebjZnGPWncdzT0+w0u5eQXtrGiBcIyoPmNMXwpb/AGMTSRRbH6YAyPwqK21GKdfL
- BAVfu+1SQX4jnjKFsp03dPypCKN9oEaKSkC7R0bGKpnSlSPdHErZOORXV3Ouy337sCLB6kpx+FY0
- t+VfyrgcbuCB1oAfoMemrcImq2sZX+I7ATXS618PdK1DRlvvDEaMq5LoV2nisx4LVrUfu5BOePau
- m8EQS6PY3HmFXjljKhTzjOf1oA4mz8OxvMrLbW5RD8wbByKg1LRrRriRYY408w/KAMba1pRaWt/H
- a6a7CVm2u7N8lUPEujzaRekzSK6tgqVNAGNBZJauY5Yon92GTRJp0ROY0Un0A4q3c2odkaYOMjii
- KL7NIDGcj1NDAZBplmmWv1xnoFHStfS/DFpewqYoYm3DutZ8lv8AapdyOqk8EVteEbSe3KBSrDrQ
- BT8S+HbawiiWGCAPjsuMnPesqHS4JSFlSMP7DitbXbvfrkkM2eGw3p+FMfTh5X+hr8w7t3oAhOhW
- u8MkMZUY3fL0Heo9UsrN5FFrbxKmMBgoG41fWFra0Acjpzg9aoXjtgRoo29vagCoun27kbY059qn
- bwykskYjRArdTT7GEl2UqMr2q/JtVU27iR15NADdK8DC/wBPle2iicxNg5ALH6Umm6FZ/a3ttQt4
- g2Cqnb0PbJ+tamn3j6ZCW0nILfeBORWVfO4dhLw7fMW7560AZuqeHf7MuTFcRpv6qVGVx70q2Eci
- QwyW0SsPvOqjJrUtb6S9tHQKGeMZYuM8VUs7gRxbrncy9mWgB1x4QtTHvsQWkHJVhhax3tkhugHh
- UkfeAXIFdPZ3v2uxkQ9G4jI6/j+tYun3r2Fy6yxeb2Py5IoAqXenJ5xaGNNvXH/1qcLSGeBdkSg9
- CcdaswC3be0pfexOMnpn2qaS1KQkQASKoydvLCgDNi09RKTNCuO2BxVjSobc6gqXMERQHkleDUsc
- u9VADbG6qOWAp11bLbptkjlCkZRsde9AFi5sbO3kKfZYTnkHaOlVbuO2F5thtYcADjaKXUpHj8ku
- Co2VDFL5wLeg696YFwQ2z7Qtlb8HJO0c1Zsr7T7a9kL6XazZ4CmMFRWfHdkEgjGRjPpU9raP5LSP
- j5h2pAWdQ0+z1KdG+y21qvcRqBn8qXSvC+iTu63ssqyE/IAuR+NQwSrGm1g+c8E9qiSQW9wPNYYP
- OR2oAW68GNa28k3lwGNHwvzDJGfSqM9nHBgm3j59QMVdmma4zIjsUBHy5OKp6o8s2BJjZjjAoAro
- /nysbgYY9zWmLPCR+WQQwyaz4k2F/Pbft/GtKxvUeFN+B2x+NAEptsWpZSdo9etZe8su2X7pPFdU
- LeOazKqVwevNYt7pw5EA5HIxQBQA8tAIeGz1NWIJvJlhW5OQBzjrUMR/eN9pwoXjB4qQ3ERJeYcy
- 9P8AZoA0jf8AmybVxsHAFS6jp63ixmwjIwOfrWfaou12GcDpmt/w5qJhXc6hh2GM0AZkHiRpblVl
- G0RjGMdxXQ+H/E0Rm+bjdw1crqEHm3EksY4Y9PTmq0cskc42qUOfpmgDovHOhLBOZ9O+aEnIUdRW
- QZft1sgum/1Ywua3fDfiFDL5WoEPEwxzzirPizwTFPZC60kYUjcAp4NAHPSq91EoRS3061DHD9nb
- 94Mkfw020v57GbcCRt4IIqzNcedIH2jc3JyOaAIYrRZmJxtNdB4fkGn2hluBgBR+NZ2n2X9ozAQD
- 5qvaxGbKIRXkuFU4C96AMDxBKZdQkuEUkStuUegpNM1eWScAkqpHTHNPlwbjMzExZ4Pal1PS/s6+
- dY/6vuwPSgC9G8c0A+1xEknrnpUVxaeXNm2dVUfjVazvEZAEkMrccZzV1YYyBIhJP8SZ6fhQBSmV
- 4JfMVT+96UJdSQdcMO4A6fjVmTUoJiqTOMJ/q+elRyQs0TtaxF0PVhzmgCzpd55r7YI2HHPTmrV0
- sDTF7gnJXGO4OKyNKgn80NbFhjoBzWjqdg6SISPmIBOaAKVnI1leyhsMJOD7CqOqRtZqotjiFulW
- rhsSMshKH1ogsZbmF475TKifdf0oApabevHIAhCYOdxp0t59luS0I+995uxqpdRyWsrqmXGeCR/K
- rVlZfaogqv8AvD/CaAIY42kV3K5zzn1p9jNLp6u/A80YPNWWsJNPAVpC4JAZT2HfFWJoVmVVjhVk
- HTPrQBPoi2wsoo4APtBHL+tP1mS5uVEFxgJGNqH15plp5WmyBriMRsowM8UybXTNdbrpd6A/KKAD
- xbJAGs44FIPlnd9c/wD16ynt/LiDW2SR2qa5vP7RnMs6BNuQMd6jhkAUb2K8+tADYp0fhj8w6itC
- yQ3CFYeAOoqi8Uew+UMuf4u9T2NwIW+UgMetO4FmS6RJ1ik6HqxHAqC+gimUiA8DvjrU0kcE8ieY
- itu+8c0+bShaWxksSZoM4b0SkBTgha0cq33Cuc1SvrrLFV6jpWqbuGe1HnnDdAKy7i3WSY7OT2NN
- AMulWSV8ZDNzxV7SlbaFjClx69Kpww7W3ct7jpUtnNJHd5UjZnt1NIDdt7h7NQ7qGfpt7VR1XVEh
- dhEpP94/4VpafexTy7ZlbBGDVHxFbQh1j04HaOTkdKAM5ZVlYso3E+tVp4w8gx0Bqd7QxNu+6D6V
- DIoVySxAx2NAFyNmli2pjYBz61paW3lWrFS3BwP8/hWJbTBFJy2D6HgfWtiTWPsqxraBHyOeBg0A
- RSoLSTdIepzz0606exTWyQGMXljORTNT1B7+ECZR5fHzDqapfbHjbFkTsIwSTQA43ptyyS44Paun
- 8N64Z7Bre4YlZBtU5+7XLTQbjwN4Pb+IfWn2lw9uyrIw2Z5HpQBv3GirHc7LxWVZOVI71FNp7WDg
- QYlIIGD6VvaPdi+tljb5yeAzcn8DT9YtbPSpVhDM87jJ3Htjnn6UAUIrJreD7Si7MDoKhv8AUxqt
- pGt5GqIOr9zRfLM8ZFgZGtex2nGe4zWKN8rsDhYx2JpJ3Atx+HxcRSzWcpcL/CRwaj0zW1sQy3cS
- nsFPSoYJpbIl7dm8tT8wzV7+0hqEO1Y4lQ9cqMn9KoCp9kW7kaaxU+Yx+5j5etWrb/RGxfr5bkdu
- lW7KFILpfspDbVyc1fjNnrLtHqOYWP8AFjGfxpAc/e6Ql/GzW4AfqBWfpupS6Xer5vPlHmMjg10V
- 5pp0u4JhYNGvAYHrUn2WLWrVo41AvSMRZAC/8CPr1oAvafdWOuNG+lqDekY+zg8MPXPX/wDXWZrF
- tcWNw0erKElB4Rf4R6c1BpqyaBdbrnEcwyAc4x06H0rQS9a9jUTgOXPzMwycexoAw7u1jYb3zkU3
- Srtgdk54PFamv2C2pDQbWjcfKCeSa56aJld23YA6ZOKFqBrXGjjULuOKxKuZOTn+H/OKwr/ztOvs
- uCrg7RgVLYapPbXAEW4EkHJNdBNBH4gtgyhFmXuw60AVpbT7VpiPJ94jLetQWsDRSIYz8mec1c0+
- 1nexdrw7GjJXk/epsFtDPG0bOdw+b5SaAKWsXA+14Y71FQi5S4RvlAC8A0y5hHmHarhvQ9BVGSQx
- sUXPHX3oAmDCJ8rzgHg96gQ+ZGWbg9vahNRG7EnalkkF6hEXyD270MCWF3aEhdue1OsmNnMAih/r
- VaBgAUY8561PaubdnMxJXseuKANhIY5Assp2v12itZtAgubEi2nb5xuKYHWubstQaO6SVzujTqpP
- X8K2rXWLRF8xZJPMfjAzgUAcxcNiaRSpUocc96sW+yNgZCMVF4lvJdRvTOYkj52jbgZ98D6VWmlY
- 2qCUnJOKaVwCzviibANwYc8Utkdl7tbKhjxmpUspvm8tgn16ipigSEG4G4pxu9TSA27GeFbRlGGm
- P3cdhUN8GEP2hV3JjafrWfpU/wBmuAcZLA4/Sr1trkarJHcRmSEZO3uTQBmrcbZCLoDZ2x1qOHSi
- yebJIAPQipp4kmbzI1EQJ6GtCxsoHP8Ap91GB2yDQBlSWO+M/ZsBHHzZ71XkfMIWNgGU9vSt3U9N
- t9m21uonz0Iz/hVCfRkjg82FhtHDGgCuZ8EMjDZjBzSZ8pAwU7XbGT0pWtEjjAZgV4PFOml2QKqk
- OoOcU1qBNYRSrdkrhw3BIrah8KwXoV/m3PyVzyDWNp999kccgZq/ea7PFAGgZlJ6EUgN23thpdi4
- V1Eucr7ev9K53V/ER1a/MkuWdBtG04zioLrXJ5wDK2XAxmqVqmZ2YPtHJ/GgDsvC3i0ppr2d2ish
- yFAHIz706bRLNdOPnErKw4y3NcvZ3pjA8o4kB61o3OpSX9nbx3QIkU/MwoAj/sGaPzFjlWSJjk46
- ioYYwqssjIHHAHpWm4ESN9nYDIFZV+I7uVI1wrY5b1oAtafcvb3W4MM9Nx6U/VZpNRys54ToU4zW
- KXaDKrJuC8cVdtpi1gzs43HNAD9N195bdYtRIUR4wD1NX2KuA9uThuSQelcsZwzq9xyzfezV/SdX
- e3m8pXJhkPKkUAdYZk8RywjVVJES7U2cE/WtA+HDHohuY3Uxg7RF/GeaPBlxaawMW6rHKnAU9SOO
- lX/FFv8A2bpzTQk+cpAAz93nrQBx+r4c5CODEOA3Y+wrKu5V1C1GFKznkk9K6Wzv49fs8Xf7y7DY
- MhGNgrmtX0s2t66WknnKvUp0/WgCnbrJFdot0NwJxkDFdDYp86oMjjIArJivxbR7LuMyEjKitS21
- MW8auuW44H93/PFAG15aXdr5Uv7uULkA/wCFc+Yvstw0at8+eoq/p+rm6vRJMNwIx9KranYySXSy
- WEZZHOCw7UARXFyj5STAk7ntWVf2gALLyfUVoataLbfLO2SO/Ws2c+VwhLK3QDpQBmz2xAyCG56d
- 6uWPlnCkFcjoTzUBkMc/3cZpwn8oZkDFs8HsKALN1apDIHOeaiLkRkMOtSXE6yxAsRUcdxldswIJ
- HANMCuJW8xQgOP51oacWPPGAeRUUOIZQzDhecd6mbIcbPusM0gLmq6bHPohlhDeZuH4c1zzF1+Rs
- HByDXTae0s0IhjjZg3GPWqOs+HpLCTbNGyb+cHrQBZitjPEzW/LL97vinw2v2m2aORec9AKXQbsw
- ygBBiX72TWxfaS8kiGFQAwz8vWkncDlbqNraT5cjb/n+lMGckx8kjOa1tU2TxkPkMpxyKyrhJ4Wa
- KIDbTAkgvIp7URzgBwe/BpZYrd4vmZWNZ81x5cgBXDdzVlIvtUOGIBHpQA2aEROpR8DsB2q3bvG9
- iySzEsTkLnrVMqViCZzt7nrT7GBVuQRnODQA6Q+Sx80A4HApEJB3BAR9K19EmhkvCJ0ZsKe3tUc8
- Mc1yy7cpn6YoAzoUiclnYYY8AHpUl8zRxqpPy9qtC2tULgSMAvQ460lzIl9b7YiDt4GaAKMMQlJ5
- z9Kj8gIW5yKnS3Crlzhh6d6k0mbyZT565Q5z60ANtrRpPmhzWhbwy7DJcDhhwMdKlt7aK+gb+z33
- yKdxVuMCqaz5cqGYfWgB6yu8rBB8o6Gs/UpjGQXBGPTvVmSfyImyepqrqjbIw3WgCDz1ib9yOTg4
- NbVlNBJYvlVBHt1rBaPzQWU4IHSn2FwRJslJxQA6e3M0O4oAzdB6VXR2iKGQENGOK0ms1eAkFjF/
- BjrVGaAo371smgC7pety2kwl06Vo5AOWXmuwm+Itv4g8Ota30aWlySAJQfmkP/1zXIeG4Y5SVBB3
- evamXGly2tydwG0nKkHpQBZ86fRbpBLI252y4PGRWhO8Ml1IbJhHn+BTnNU9O1oRwvDqqhB2lHJP
- 4U6awb+z4JdKbzdh5ZurDHtQBat5LaRHiaOP7QejEZKD/Oauy+FI7W3Bsroyhxkq3QH8q5a7ujM8
- nWOQnBqTR9burCT98xdR60AbbaHc6ZG3ymJsZC/3hVnw/fNIXt7hygHzZp2oeIBqCxzqfmCgEe3+
- RVdrmLVAEtf3bxfOW/ve36UAV7+7DXMu5Q4/Os2e3eRWkiAGOijtWrPodxfQmeNVAPOPWsppJIpi
- JxsKcY9aAMwRyTSbpflx68VOYvOXb97OKtXAiZdzkqT0AGc037BIIRLHjsR60AVprZrZwGj4qTY0
- xyRj3PUVMJDduFfqvFRzxJCzrCzEr60ALEu+YI53c4qeGB7lGCnBU4FUopTBLvfk1at9R2sAMjNA
- GtaXsnhy2FzPHvC46jgnNQ33imTXrkz3oVFAwo9Kfrtq03hAzEfJ5gyc81hWM5hhKrhgT0NPcByS
- P5g2uVI98Vp6X4uuNGlyzCQIQR0bI7/1rNQxqW+05J7Y4qK5ZYUP2ZCW9TSA7SR9M8V30X9nMFZw
- WfcNi5qPWPDtjo0pE7O03U/Mf055rmtFmN9E0DEox+atPWbiW7lSO8Ja4jQbcDC4A9PXFADYtM0+
- 6nc3u7aOm3IP6Vnak9tYt/xL/M445zTIbieOdmWNsE46cip42EkyC4hYx469KAFsrT7XEJgFPOT6
- 1s+H9PD3XlzxnL/MDtqn9pghgb7GjL/eJORWqfEnmrA9oFRoxjJ5BoAp6NqDW2pzRXtuyIAw3FMf
- rVS4iF08pydmeCDxWvqeuC+Ro9qglcMw71mwReXD5aAlFJPPU0AZ0cEsbkSZKH15FD2xJJiJVj6c
- VfnzLGEXAA71PFpDPaebE6/KOh60AYVws8TBgrFe57CmHUG25RVJA7AVozzSLbNvX5T1AHNY/m/Z
- nPlqwDetAEtvqzJNu3FZBwQBjI96vPqkd3mRtokH31UYx+VZqWruxaFl+frkZxT1tvs1ujJgEH5m
- PR/pQAXl2S371XAHI+Wkaf7VD8hGR2arKySylRccQ98DmiS0jifdsdgeODQBQd9x3IBx1xTYlBm3
- En86sXUAwPswKg9QeaBErIEj6nrQC0NHRtUjt0K3AHzDABGcVW1fTzJL51jyOpz0NVooispebBI4
- wK2YFEthk8qR07igDAgJil+TKtnnHFaP2h5yI3ZsgdSfaqd2P3im3BGM9aktsjmRgCOaAJZrMwR7
- 3A5PT0pdMvZtOning+byzuVDyh/A8VHczSzDPy7RwOKgiuHEewjKeoFAzp7TUNM8XXEw8RhYNQmP
- 7ny18uNeOM7cCtMfDiS8uY0tDEYghyynjPbn864htP8ANhLIehzWzovxDvtFsDB9+PI4I/rQI0r3
- wNc6DO0N2VaQqW2q24YxmqFhYRgE/vkkDfMGBBP4GrSeJ7tZd6SxvIfmK4yQP84p0XiyC71gS65G
- 00zAKGX5Qv4UAbFpd28WnIsBLsDzmub1+AXt1LJEoQqfu4xu+lbWsWgs4/NsCXjPIbqK5+5kklmE
- rDD54BFAGb5cjybCrAnnB6ipEvXil2sM4GMVpFY7m4UNmNyOWJ4qteaM0BISVZe+RQBFHC2/zISg
- B69KlIVhIHA3HuR70lqotlBulY5P4Vcls44k3u6N5oyoHb60wM6O1SRir5LemOKv2vhuW4iLg7VA
- 6k4FTR2ax4aaVIwR3HWqGua5PcQm1WRBH6jqaQFzWbE2nhzynuIi+8HaHyKweJSEQEN6jpVcKyOw
- cMVznOeKmtZvOPDKuOKAJbi0JYFf4eue9IW8sncfvdqnlvVFyFyu09abI0bysMZx0oArC4eCTcgb
- juK2dNvE1N1M0ohljGQzc5A7cfSs6aweWAk7kTuapQysIT9mOSvG49aAOkvzLMxk06QNuG1l7j3r
- PlnnJAuGJij+nNQ6XqT7wEYqyn5v9utLULaW7j321uiEjLqMkKKAIotbghb/AI8hKGPIBHNXLG6t
- 7uzk3RLbKG/iP+Fc+8f2d1eFztzyD2q5p2oCFWRoxOX52nPFAGgLyC2lyZFKdB70r69buxRJBHjr
- nvWVdeXLE7xE8fwnoPpVKZUnQPkBhwRmgDq7a9tLyARWiiWYngL1qG4gurJ28+NowO2a5a3v3smD
- aa5WUd1HNbC6zI0KSX13JO7D5lbHFAE4V7pi0b5x1GazdUtXSM7v4iPw5rQ0/XrcXX75FgUdxzuq
- /qFrp+sWRe3uDkc4BFAHLRDY42ycd6uPOXiiV+RGPlWnXOg3IQvEmIB/Ft6/jUUEZmMcgydvzECg
- C1G2+Ly3YAvyM9qY88kaFcmmp807uwPJ4FS3do+Fzn5ulAFVrjbgS8Z4yah2C03SMffNWZdPknVA
- iluQOnHWmX9pILvyY13HHK46UAVre7LSyOCTmtjSiy7VijLeZ0IqO08OzPIUiTI74Ga6bRP7O01F
- h1KYJOv3V4BoA4zU1lExMrkbOAvpVcSifhjgrzmtjxPp7pO7SggOcqfUViy25hG5fSgC8rrLAojb
- d7d6SexlEgwpRfTNV7e5LFBbKAwPNWHeX7TguxI7GmBPBExhaNVIJ6egqOVknO1fkx1J61aj1gLC
- UEKlk4LVWvozC67kCFxkD1pAQ24e3uDLC3z9CR3H/wCqrczJdOGiOxvYc5/CocMYhtUBj3xU8Qjk
- XbKPIZOjqclvzoAu2HiO60xPKvd7wY/1fGBWnJo8WuW6y6XIPMYZEAzuH9KxISonAuzuRzgk9qtR
- 79KmMuhTt5cRyxznFADLzS2tMw6pAY5OoDEZ/Sm20TQQ74YwVQckGtMatB4kUpqreVIRw5+8aqXF
- jc6bAsbD9yThWz94UAOmmjvrRCMJjOQRVS0sD9pLyABM5Of6Vdtrdn+RUGcZqO6uRBG0MuFI79KA
- MfV7r7ZqDI7kohAVT6U2eJNimJQOuTnpSXFussrMvBz1pJov3YUsR9O9ABblRncQ3bAqY2EUwIiA
- Vqr20ojfYqZx3q9bSKAGcYJPIoAoq7OCEQBffrRDGEcleM8nNPjuGkhHmbB74ApvmxltsuTnuDQA
- +SFEjDwu5buD0qpLL5vMg2kEdOlXECMAyZGOMMePyprQRI5N0rt3BXO326UAV4b0Wt0pC5HrXS2W
- qq9zE7jcO+OhFc81kbg7iMqeAFHSpLa8eymaNOUIwD6UAavjPQYYybq1bBmXcF9O39Kw4iXdDKcE
- DAxW3q7NdWELISdiYIz71kz6ZNZNHI0cjqQfujIFAEtzAtu/7vODzmqlyzNyAo9vWp7uWSWJd+AM
- jjGGqOWCSWRVVW2+uKAKskpWU5TP0p8c+ExsPPNTmCVD+5U/QrzRJHJGymeOQc45HFAFczh497KR
- jirWlEsAudvII9znitEeBp7yAPZvEVPJUsP5ZqCO3j0yYDUNwliI6dOPpQBt/wDCR3Wj6eHFujvI
- do3DIX9KoHXoL6J11CJYZAONlaWueIYtY8Nwx6ZHu2MdxVeTXKG0eaXKRuCeuBQB0mn+HRe2Yeze
- MqRkFmwfyra0rwsIrRmvZICcgDLVw7xXFuFd2uEQfeAJAxUkkjSxh4J7gjPAErf40Abvjq1i0y4S
- KByCdrfL+FUI7SR4Wc+WzMOCW5qhf3Mt9cCV2ZiihRk5qpdTSBgRI+R2DnFAFw2k6AqJZMjuD1qn
- cxzyyAkPuiP3ieT/AJzV+01R7a2RpMZPVmGQ1WVuTqLDCptcfMBwRQBEkst/YMCSTH8vJqtJaoYQ
- JPv1o+ZDZKAo+UnBpmrCBpRNp4/0crgZ9f8A9dAzCdGgkOynxSus2xjkj+L1qW5/fxYj+8D+NRWz
- R4fzCd2O9Ai0lzI6mPaMOcZqW4uI7rbtJ3IMc1XScKqncQT0olPlKWfBz6UATKjSDcmdoFWtPCyR
- kzckHiqUV0623lKVIPzHHWp7Ic/vSRz0zQBcCqdyT4J7YqC3uZdKv1a2UupO7B6H2NMglMUsmcnd
- 0Lc4q3BmaMBiDjr60AWJRBfyb9P2RueWJ6KfQVLHqMdtcEysxJXayN0x0yKyWihWQBdwTOSdxHNb
- zWEF5ErXhX7QQAMNge2f0oAnhs4rq2kksHwirkg9SfauXnJnmL3AbL9jXSRWh0N28x1cEfMqtnA/
- Cs+70+O9/fWRIb+76fhSTuBimbyyyKDgnipLk7AML1pZbCWO7Hnjn26U6ZykRL+veqAryuvm/Jwf
- Sk3mo2AyHyCT6Ux5pLU5Gwg88gGkBPNAILUO3KmooyjL8ueegzTvPMsRjG4qBwKrW1sxJZzsIPGa
- AJbmfp5q7MZx71NZawEi8qZSyHg4NRGLzCPtB3eme1R3Nutocodyd8UAaVtqEUDlI8/N3PaqV2Ht
- X2x4lIOSwHFSWkEFyo+cD1BpbmNbNdkh20AMh1UiJ1c9RzWj/wAJa1vYiK1RmRvvetY5gDENxgnp
- UlhN5TiI4O4845oAmu51lXzFDGQ8jnpTra4uJkBAOQavXvhG8tIhPawvJAfmY9gKE1COwgIiAZiO
- 3rQBV866T52Qsw6YrXguZNTs0WSJ8IPnHr9KwZNamNumZSpPU4pbPxBeRy/uJjtXqfWgDodMtnXK
- QjYeo3VnalpiXjMzXMKS9O9VV1ydCXkmLY/SorWwTVJTmQEt81AHTeCY49Mik+0SJKmOg71W1bxH
- HLdgaXaSRNnjdzWapGlBBG2ec4GKtQ6yZD5hjLMvbIzQBfutWC2ajV4ywwN2OM/Sql/JY2kKGzU/
- McnBBqlf3Lam5e8lKMv3Yz2FU4VjgzsGQ3WgDa0ya0u7kxzgqCCcn1q43hizkEjRkOoXcAOua5Ka
- 6Mc3ygEVb0nW57ac/ZC4Xuo5zQBBeZjcwuMxRn5fUUmnySx6kv2cgg98deK1LjT31pTLpymSVuWi
- Xqv17U2GzFgFBUCVOo7igCTT7cnTp/ty5ZnyCvGOKz2uwimOY7geQB0FWY7tzu8xiqk8A96qOvmy
- MSowOc0AVpkkgk3uAiP39KkjtonYtnO4cKOP1q1Z3K+X5V2N6OeM8gfWiewaxiKhDsAyJB2oAk0u
- 1juAwniYshwoB61FLZfaJDv/AHWexpulXRNwpjkP7s8nu1Wd4uC7zfezxQBTjxZTHzlMigbdy8Up
- YXEv7nPvk1aNqbhDhgARnFZMCvbzuWZgc/nQBo2l6qs63AJA6VIsiG4DI4jXP8XeqcbrK5JH3xkH
- 0pWhWVR52CF6UAa8kUd7H8rD5f1p5txHAfNPasWRCjgh8D0BrV0a+DgCdfM3DaB9RigCml/JFPyB
- 159xV+C/wfNHAbtUN9orxO3k5dhycfw1XmT7JarIjb1k6U2BcuNSVGDSAPu6be1QTXcO0CVSwbPA
- 7VRtpftEmxW2Mx6HvUv2V1J2jkdaQBFJB5jBVYemetRyW6SqTKCfTFNllCHBX5vWkLBPvk4NADTG
- 0ePKB5qdLN5NjycqvNQIpZAFVj71LsaJQBuGaAH3aCVwycKODUMsZgJjxv8AXIzUs0DpHhmBycjm
- gOd37wdRjNAFETeTcARAbSeTViApfrhjufHXNJNCsUu18Z61Xit3Q5JxQBdW0MYKyn5hSf2BPIjS
- 24I29T6f5xUMMrs5HOF71ooVmtMyu3ynAAzQBqeCfG7aaPsmuYkiYFG3HseKq67YQW2rSNpLCS0l
- GQ5GSh74xWZc2SyxK4OZl5x7d/0rV0K+j+xPFOu4Pwpx0oAo3OnFreM7AR9Kp/2eYpxtyCx6VoXd
- g2nSlQzMh6UxJdjqSpKgfN6mgCOLSZGkKyYw/wCn+c1YltRodoWA+Y8Z+taPhWz866DQqxLdmq34
- x0ZbS23yY3NgkUAcZcSyrjcc7zw3YU62meOeTazdOhrZ07TYLkYvSFVfmqveQWkDj7CW9zg0AZs9
- 8wbO3L8ZpvmGRsyZQDsO9WLu0EwZojwMc1DJCrsA5we1AFmGVZLc7Y1bA6nvU1gIyNzgxtnoKr7I
- NgHO8dx0pJ3AYG3UnHegDRS+NpL5lsxh3dQverj38OtL/pKCKSPhWU/f+tYEt98xMnC9qgludrrJ
- GzFl7DvQBq6pYNGdzHGO3aqS33kEBhlSME0+01z7OcXGXRupJ5H0q5fafFqNuJLLnofmGDRsBmJe
- DzMEZGevpW7o8sN/bzLqTBML8oB71k/2YYh83FQRqbdtr7sDv60AX7jSo4ZsiVo067hj9anuNHey
- jVizMj8gkdaqQyi+UxjO7O0A96tXDz6rEFucp5HygUANGEQKjDJGaqzWbzgyn5QOPY1p2xZtOaGN
- VMo5BPoKqxa1NHHtmij+Q4xkUAUraZFiYScMOgNMf76CIZHf2q5KRq8arEjK4OTsGaki0oKwAEhP
- uDmgCohEsqq/O6rrMNMj3AEdgfQmn3tqUgEcaYz1JFMtLdn0wpFGxYHhjQBa026M0XM2WQ/NnHzU
- 6Yw6tCPt6rbpH0CdvzrPtrZ45ceU4cHk9qtzW6XLOjqwY9+1AEa+HWun8zR28xU5LAZx+VLaGSV9
- jrkr145amvEY4hGkjKMg5XoPY/571vaHFDr95HHqDMkoU4C9G+uKAOevoo5iSBjBxVYwLdRkL1Xt
- XSeK/CdzpkjRMqyJ95SjbsD3rmJbUwoeuGOCfSgC9eWc9rcbbdA0KHPmhcq39Ka8e9DkBS5zk1X0
- /wAR3dvEtuTm3AwVzW/D4w0xIEivbOaSTAVWBAH40AYMu6CZDkFcHcTz6UrtkYlwVHIwOtb91olr
- qtuRZSL5h5EX8VY97pc1jKAqZ2jB/wA/nQBRJhubjE4YOOnNMC+S+DzmrMkIA819wPTbjmqwfzcM
- 4w3vQA9mbYwgIz/ENvSm2t+6jZsYKeTkVYjn/eqwGAOp9aeW+2sdkgVf5UAQLKY5MHGferNv+6IM
- XT07CmyaeZIS1vtmkUdQKbZ+akOZoyqMe45oAvRzjUJPLLgSds8/zqyPDzwETagy4U8YwARWMbcw
- NuDDePenPrbXEfkTn5hwrdqAO709LPSbbzlZdvqD0Ncnr/iufX793uWQrGdmFGBjpmstdQeFRHKx
- 2Nn5f73+f61E7iLCxDnrjvQBaubtNypAxyRzg0q263DMsJIzzyc1mwyDeSD82e9XIGUIrSyBNw+X
- 2+tAD3tSpcFvufrVZbdL2XbnDdjnGKnhs2nkYtcIEJ6461HMiJIApBVe5HWgB8mmtpzDzSrrkZYU
- 65mRGYoBgirEkCStiJlC7c5IqjLNsYhtu0d6AKkshbAZcAdc81Gdwb5SD6cVZjYy5WXBVu/pWppn
- h63urfdLdxR47MDk0AYjnhehxntVq11OVANuTj8q2/8AhBZ7mwkm00CYKQBtHXrWe+kTWS7J4zE+
- OQ1ACQX/ANrkC3DD0wODV280KQwM0jxheueKdZWcCrvkjYYHUHvRe6jFLapHtLKeDjg0AVrDQ5xd
- xuhIUEMHx8pH1roZtH+2W+dPIbHDMOcms+81YNoqWltlFKhQD1HNP0e5udHsHFkcyMRkDoaALUPh
- aa1n8yUgqRgjPOO/eq+reDkvHzoQYIB85JzzW5HBLqWmCSWQJM3UEdB3/Sk0S3uNPmIkBlgJyXAw
- o/Ci4EHh3QYfDsfm3mHklGGLdFqS91HSYpvMw0jjkhTx/KqXjLUg8hihYiMn746H6Vg+QYxuV9vH
- 1oA3xrem38TNe28rqp+VUyD+gpbTU7O6ylvEYoEBPzjDAjp2HeuUk1aeyfNqMH+8BTrvVhqEAMuP
- O7n1oA3X1Q3U0klp5S7OGHFZt7rj4DwxlTJ6riqMTiDZsHTn6/WpbfU5EP8AxMVMqdFIOMfWgCZb
- lpEO/GDgn9K6bwZpktjcC7lUsAMYPvj/AArBi0lrpc2sqbZsHbjkV20SvDp8UUZBcDp60AY+ueIZ
- dIu3Frh0lbD+YNxAPXBPSqLrpuunyNPBSSM7mZyQpJ/KtWQ2uqvNDcjypQjAFjnJx0rhNYhntbvy
- 7jcucgIe9AEUMOy5ImYgg4xViVVa4UFSoToc9a6DxZoEdqv2rTsHzDlx/dFcujFpG27vlPGe9AEi
- anPpV359o7b143jqo/yP0rWs/FSavF9l1JltlB3tOerd+axl3XGfMXC9896iu7UbtyYIxg0AdTc2
- Vrqe3+zZxIF4Uj+I1S1Hwpexu0kts8aL7Vg2t9JZ8REjJ+UD+Guh0TxjeaW3/EwAuFAxh260AY8y
- ujfLkBOCOuabHcqgCxYAbrz0rsbSysfHdzks1rO33Y0AwTWd4h+D2r6M5mmt0ER5D85P1oAxLfWZ
- LSYrbnAb5eKnudVnyELFkHOcCqUmjzRzBWyD9K6W38JtLo6TtkLzmgDHtryGZiZUDZqDU1Vl3wp8
- g+9jsf8AOKmGnw2cpE8jFR1I7VdGjRXMQa0kdoSPmHrQBn6bYnWz5NydjgZVgORWeztBK8ZBJQld
- x6nFdZ4ZtoNI1QPI7O+OB7VX8faO9rdC7ESrC4BJHqaAOcgUTtuORiraW0M9yiXLAIeoPc+1RWar
- u6Haxq7e6ekEZkBGzGVz1ptgVprUw3ku3iJDgDPUYFEzAwZRN2CDgUw3JEkezD7+xolvytwn2pVV
- RkADv060gLVlMk4aLIDHp7+1Vbu1+yzgThiHOOelElyIZl8v5CDkVtxWkGtaYs0bMblCcr/KgDCe
- 3LzsN20L2HepUQJnHI9KsX+gT29pHKCd79qWw0u4aPcwU4796AL+meIr2G1aDSbiWHOMhR1qxZXz
- xXBl1n/iYBBlg/FR6VZW1nciS9mdJADgYGO1Q3pIOOu5hz60AO1vxLDqluP7Pt47eJSQ2KzvtiSg
- eWuPpU89gsfzH5cc+1ZaSpbXRZT8tAGjjz237gNuPwrc0O48uUPOM4GBXORXC3HmJD1bB/QVZivZ
- fLwp+71oA6fVfEiwXC+UBGjfKTj14qZbi7gtJWjkY2zx5C9s4rnbCRdZiaOUkFQTke3P9KbYa1c6
- XcBARLEWxhzwBU2AotqzH5Ls5YdFPOKmiu1KgxfvCOqHrXTL4EXxLbl9MO6bGRkYzXPal4TuNLu2
- ju/3csfUD9KoDO19yChhO3OcqO1VoZEUbHVckZL9x3q09s8a5uDkZxUDWX2i4OzgHvQBLCwkwyEF
- c4z6VNDZm7utkROCfwqCzAhuGRhhV/WtR5okjjkQ7ST2oAlSRtMdUjHzR1p2OuOI2Ly4kHQViS3K
- iYBMsW5zSNF9klEjPnPSgC1dzm4uVKSMZd4JP41oeJPD8+r6ZHLbwmW5H3yCMqvr/Os6xu/tDfvU
- CqSOfWuj0yf7OxLO2CAG9x6UAZs6vcIqSiVw3GQMisR7RVvpFkGFU46e1dN4c1hYmCXm0quDIO9c
- 54quVl16drdDHGzZX6UAV5bTzWIi4Ws6/DQEoQSpI5q9BfywxkS7WU9OOlMa3F8hG7bj5sn86AKc
- ErggKVA96lFwLcYHX3NQPAHnYD5e26pAnluA/JoAu6JevFqsEqs4YN0HQV39p8aL+CJVnWKWOP5c
- OAf6VwCzrbxAIMMefpT48zEFD9RQB6hZ+PNE8YqsfiJFt5GOC0abcH6ioPF+i2/hiGK50xmuLOQ4
- AjO9s/T8a8wlzLIdxKkHIwcc1s6R43vdJi2xurxsdriQbto9RnpQBal1C1urtzcIVjfqu3FRMNM8
- zbpplViehyAKnuU0/X4N+ixtFdR/67e2fN+g4xzWPcWzWFyDL8gP3Qw+9+NAGhqulSWzpJHt/wBn
- Bzj2NejeHLG28f8Ahox6/HsmA2DHBGO9eTrrksUTKSOD0Par+n/EnVdMRVsZYgpHIK9u9KwEvjn4
- eTeF9UY2Jie3HI+bJFc6b6eMkt909j2rsrTxpYa7bGHWYpXlc8Ord/yrOu/B8gEjQul3Ao6RjLL9
- cGhaAcu0skr7mK8HtTjEAcMMk881Zm0l7JXxg7uQBywqqzysygDBPr1qgHSWqzANL6UunXjWBOxW
- KsaZcggbu4HSlindrf5ANxNIDqblPteiWrESNC2fujJ7Vd0bRY7KLfZswWYZYSdT2/pWJ4Q8ST21
- 1b2krIYj8pBFdd4k024ht0nsdpjA4AHNAHO6npkSs2SwPase6ieJcSYdenB+atGbWykgF9G2cHvi
- qGqMxiWW0GFyCSRnFAFeSN4yGiLE9we1QXYEhzMo+bnAqaC9YzbpSGY8CoL/ACwDQ80AV1mxdJwQ
- q9h1qd71WHU/QdqgDO0gJAyevFE4WI8dW60AafhzUHt5v3ZAzxVzXNFku/38Odg9KwbK4ELA4z+N
- ddourgQKJsMv92gCr4Y8Qy6VGUmkdLcDjn5/8a6vS5tM8SWTG3kkaZeP3xIyfxrmPEuk/ZXF9akG
- CY/LHj7tZy38tvcxSwnYw7DpQB0viLwrIigwhcHqAeKxDpbmcgJtKjOfStXRPHgjlEeuAzZ6bf4e
- lajX+navE4gZIyQcFmxQBxd5ZPG+9iuDxmqitHGR5oO09M+tdDqmjNsDl90YPBHSsJ4N7uH7dOOt
- MByxj+EkE/d5qwYGkUNu+VetUgxVz6gVNAryx7Y84J5PpSAeZWjG8A/Lg1sabqn2hF8wnniqPkK6
- qk/z/TilaEWo/cgqKANPSbRba8zM6MXGDzVPxHYPPOzOOVPy471R03XmSRXlQEHv6VstqaakgJKh
- h0X1oA5jBjYrP8uTkA9TQ0qoxLHqPyrQ1+z6TMu104x65/8A1ViSsVc5GdwoAseWbkDyQWC01QVv
- S+5WGcbe9OguTFZqIjhxnPHWnWTCO6LyKjPnpQBDfs4n3sMc8Y7VPBKWT922498U7X0RCjRnJmAL
- KP4aq2rtA/ycBu5HXFAGkYg0GT8rY5J5qIw5jyMORxU28zwAou5jxj1pnktAzCUlT1xQBHFP/Z8w
- dpNsg6ccj8a6jQPFNjqdqbfxJbvPM/yxTE/LF9c1zsNsJ1U3EYIP8VPe1iicCORsnnHTBoAtat4Z
- mS92Wn79WBK7aw0ia3uXW4jdChxkjvW/Z+KLjTZFd4hKwyAc44qy+nwazpxEOPNdvMdx1UdTQBzb
- AbSNyqGPf+lWvDPiW58IXDtZzOIpRiVVON4qS/0ePcG04/aYV4Z8YwaoPGJrgq2AqnAPY0AdVdww
- eJLX7XoxSKfbnyRwzn61zGooyMzsreYpwQTyn+P/ANap9NvX0S4DQtzu7dhW/rel2viWzWfRiPtC
- L88a/wAfuaAOQEvyDepIOOamtbFJZWKzrH7Gpk02QRBLgYYHkDtSTaf5LBgM7u1AEVxbS2aiSNfm
- xw3St7RfiTLFZi2vUe4VRt44xWJDczTzoLoFgvO096bMomlkaJfI5ztFAG7Jqdlrcm2WNYHA+82C
- KidbiCAoVLWzfKoHOawo1dyGO4bQcc9frWppOvSwQLDcDzQSOvbmgCjcWBQsqDYwOTmo44BdAZfG
- OeuK1NYdZLjzCdu8dAKzpLYQt+6OKAK88ciXREQ3AY5/Ckmt3dlMoznPSrMU2zJxgD2zSSRmX5kY
- gdiO9AFWO3KSDgqMjrXQ6fYuUAjG3HO7rWRawNeSDLYKnHPeunVG0bR4ruTnc20g96AHxn7ZbNA7
- qzgcVzup2s2mzOl0CAT8jYzvrb1TxpZ3tgr6fBFFL/EUqpp+pJqpxeqJAPulucfSgDDfcjgxAqSP
- mB60xXXlZFBPXpV2+tms5W2oTnpk1nht0uZCAfTFAG9oOvCJBb6jueJj8qj+Grer6XFCqvHMvHTA
- zmuajlMUmWHznoKvQ6tLDEPtKeZnsT0oAkaBVLGX7x54qOG6NvkEEA/rV2dYLi08y3fMhH3e4rMR
- mkDLOMkHg9KALcN7vXI4Iq9ZyG5jw7An1rFuWMWMAopxTzqMkIxZAuOpINAD7ZAcg9F6VqaXdRFg
- pX5h92sPzRbfKQdvr61c0+4MjDyxsYHkkUAdA2lvdQ+ZcDIPGOuawNY0wWNywjwVbocdK2E1ubTF
- +T5gw5yM1Lc2kOqaX5kXMxG4nPT8KAOSUSKu5VGM03aZmRo22k9Tird26Fgp+6hwcVAZfNmCnBVu
- mKAJp7N71FDcuOI8d6pJlLlt+d44PoK0dTZLKCI2HmCZQCd33c+1R6iqXKpJBu34+bPQGmBNpzND
- bgH7zHjPapLiXMhEvzMRwarQXG+ILcfMP7w7VZjdHj+QgMOmaQCRF7AsVBZO2am2G5t2kIAJ9O1V
- 2vzM21l+UU9Cjj5M8eh4NAAIXjUeRl8/pUa6k1hGFtWyG6n+lWYX25Y8dsUs9t5tkVkK7Tz7+tAE
- 9l4hAj8q/RUf+Db0P1qZ/DUWrTO0paK9cfLGg+Qn61zc0SeYc53DgVr+HNfk0u623LgwSDaxHLY9
- QaYFa80a60G58vU1VmbqF5AFWdC1k6PqaTW6qyEbSD+FdRJd2s8IikZJbO46MTmRB7nr2/WsrxD4
- QjtohLo+9kHXPb0pAd6uh6Lrekm6hkkQSRgNtQfK/p+dc1f/AAsuGUnSWSVScgynbisHQfGFxpki
- RKw8tRyD0z/nNWPFHji/1lFihkCxKMAocUAaNt8NNSt3bzYrYsnT5xTLvwZYQTIuqzlLh/vqigqP
- xrk/7QuIwRHcXG4jnMpP9ary3kzhvtUkrSH7p3E0AdXqPgvT1vI47K4kfcCcYAx0/wAar2ngu2uW
- ZIJX3pnjHFc3DqUikfPIGHU5PFb2ka3PDe7dPZGGzGW7/wCc0AX7LRLSzcxb3eXrhhxVG78JeVcA
- bvvcVfEgudqaoyrOrbiV9Pwpmo311pMnmWmySH3w1AGRrXh6TRfLMq8yfcHGPxqxZ6fpmnmNddml
- jlk5+RQRx/8ArqO51ptT3vMwWU9iOF/CsOZHnkIkYu3YnmgDo7qPTtPszcWTu5LcAr1ycVl6p4hk
- 1BRbsCEXkCqEGqz20wEWGEZGAeRxVy+vRqV2JpUVJiACQMAUAZ0+mvaNuuz88hwAOmaktbt7C4Ub
- c8jvW5rGkp/YUEsRM0nLSf7PFYogSWEF/lJ6CgDWcjXyuMhwOAO9Y09hLbSyKy9+pqzpM9xo90Jr
- co2OMMM5ropr2PxBYGK7VVXBbIXG4jnrQByUI8xSADs6HPWpPLIjGxssvr3pxQmcqx+VGwFHenJI
- gOF5oAW0jZB5nQnnH6Usnzjrg0rW2/8AeISD1x2pWR5VySNo60AQBX2EzHIXpSQJ5kjOOFpLgrtI
- iLFvWi2Y3CFYuoNAEt4myTBBQ46Gq6OyHKjGTzSyyyXUm+/cnHc0+PY42RtuDcDigDS03UzdQlHG
- WHFSw3/2CX99lo+hA64NUorOeyG9FJA68VJFaLqNu0hkIlXkgelAF3VtEjvNMF1pKOctyPTFc/bw
- tGVeMfMRzW54f119M8yJ2IjlGzk9B/k1p6f4fsmi2xXsUmeP88U7gYV5Et3aQlWCsox+NR2eUnWG
- 7bdvrZ1TRY7FXjuQsatzHJ7VkyeXbxnz38xl6NmkBFfiXR3MDKQjHI9xUMV0ijMnNdBZWbeJbUcC
- SZU+U454rFu/DF7byNJcW0qxqeeOtAE0EcbI+4nax49qnKNY7CCG46Vjw3DRHO1gtaNrqPnBRKu1
- R0Y80AXYDHPAzlPmzzTWG2Evn8KafMMWIsFfamKxcAyjAHbNAFSeRJpOBg0xrXykVjyp6VLqFv5b
- AqwTI6dal02ZZ5VjuMNGentQBJZxXFtFuUZDcitDSPFrwOYrkFkfj6Vl30l7p87RpKRDn92eoIqG
- 31gRxk3qMzqRnmgC/wCJtIa2uzLYfMjgEj2rNs70woyIMjPLHtW7Y3y38gkUnGBke1R6p4dS/mNx
- obeZgfvIVH3Pf3oAz7W3EmGzgrSSRqszF13+4/hqOOLdGSrk5HO0d6WCUxYaUMYhw4HegCM6TLcy
- Ztkd0wckd6jtZZbPiI+aqnlem2tTStXNvcbYZyiSA4QcdMf41Y8Taf8A2dZieGMR7sAkc7s8H+dA
- GVJqTT3AKtjIxtrStNVy/kyLuUj1rAlhG4NtKqOc/wB+l+2SpP8AcKMn3s07gdJdeHPtLRS2zpCr
- csD171laro72bGSFWZRwzHpQdUe8hTDEMg5xU0N7Pcx7GVpIf4lzSAwlk2yAoevUDpWpa2hvYeTg
- 0mo2UM8w8lPs4HUDvRpsFz9oYW6NKB07U0BbjvptGhkgJDRMu01VLRyyIYQSgA3HstVdVMiSlZyx
- bPKiksbyS1hdWUmKQ5K0gJpt8UgAw69iKn0/UyJdrdOmKIPIvW/cyLEqj7p4zUEUIEr+blHXJBx1
- oAk1O28q6VoSFVhk1GbZQ25TzUlvcfakIucKAcAnqaWK1cyFkQlB70AJvJdNq5I4+tBcbCnCjv71
- LIVcAowVhxj0qO2t9zkXHKt0bsKAIpbPIHlKWUjk06wgaNiqIBzViF/kKKwBHA9aguI5oX3REk9j
- TQErWypGPOGc/pTLTy47gMFyob5fetB7EmcG3G6N8hSTjNWRpgsws/y7ouWB70gKd5dGSRcfKnIP
- HFXrHSYL61e4kfyVVcYA61lC7OrxurAKxbIHtUtxfC2sTDA/A49KAEazRmkEw+TqG9as+H7YSTeX
- bvu7ccYrIt7qRdobPLc59K6jw9pf2KUXcJBVjuI/z9aALF88MsJh1AiRoPl54Iqt5GmXUG3ABx1x
- 0/WneMbGfTryO8VB5d2N6qfTJHP5VBoNtFqUb/b28uU/d2d6AJLPV4dGtP8AQyokHGKgu/Fwu9wl
- PXgj0pmpaSmnOxmYEdu5rOht2knZ4FX3oAimiju3AtlAznrVWSAW7OC2HQ/d7VdNjLaMjurbSeMC
- s+4WS41BjyEB5zQBcgnk2ARnJbqKZcydmZt3fFVxB+9DRkjHfNWLh/KKGTp/6FQBGLg3C5PzFeBT
- LeT5yEzlB0p1zb7wGtzt9RTNhWVQOHPWgDc0iUajbPbTgM5GE9aydTtPKk8sKcDrk9adZX5+0FLc
- FZM/K1dPpmgReJLR2nOyZDhQT1z60AYWgXYtrvy5cFXBXA9+OtGpLceH9YIsZ3BwGI4+YHsaNR09
- 9C1ERTFTMjBgE6YyO9S+IoDqHlag5++RGPfGKALelpb+IbtA+Ldk+ZkXofxqHxFpn2Vpv7OXdGOW
- 56Vk3GpCBQB8pB429a0bHXN8kX2gKY1ILju1AGakfmFfJXLN0/z+VdZYQG503yda5xyPp/8AqqXw
- 2LKJJvsqbjIdwDL936Viarq8u9nhA8sNg88/TFAGrdeFbeWBHscSL/AM9DWRqnhObyS7KUYdfetH
- wkx1Gdnm3rECAB6Vu674psYbIRxeZuHBJHWgDzZw2nybQMluDVnT9T2PsJK56Ve1OS1vJ/OhOfXj
- pWVdWctu/mJhgTxQBeYrOS0xAxTojJHKHspCQ3GPSqaXCTuqpnf+lTQIJ5XRXwy0AaN7YxzWzT3I
- /fSHp6VnS2LI8Yt13kj5ucAU17me4hYbvkHXJ5qvJfDMYDNlevqeaAJTAVJGBuHPFSWuoMN32iNW
- UgjOelVo5vNUvg8HGKVollOIG4HNAGhb6dHewhrVy8gPK4qaFTZZRssT1GKzLWd7C5zDlS1a9rq5
- vU2uFAIznuaAK93po2GSIEjqefu1C8QZApc+uBxWnbQpeyCG1OB1cnjmi5sUuTlxgpTQFBAYCWEQ
- bjrmmsHvDypH0qYqYGPlk56DPSnWFuz3BN2MCkB0niGK10bw/ExCyMxwhVskH8K5O98SPfWixqPm
- AxkjBNEkkz2iQSzgqn3U54rPm4RkY4YEfhQBd0gPBMGnwc8fSpvElpFBIGU5Y4Ix0qjcanIkKBG5
- 7VGzPdIHvF3P9aAHpGtymc4Ira0fU5YYUG7KA5P0rAEgjOFjfHtVqzndD8ilFkGKAPTri4h1fRrW
- DVAojmjwjdwPY/XNcJK6aTfubdjhDgc9a19PnbUYLW2upsRJ8o61S8WeH1sryKJ2AeRSUb1oApTX
- TXpaQMWJGcdal8PSf6UTcj5WOKz5YW0zgTKZG44Bq4THLpSqj7LhWJdsdfSgDo9e16OGFba0ji3p
- wZCBzXOoYZp2N2u0Mecd6Zp12cIbkfIBzTbwRG53W4wp5oAbeWVmgY2ZYeuTVC4SWFAzjdGO5qws
- HmK28jaTVi1vhaR+XfRGeJhtVR69jz6dfwpgZEcrPcAp92pl2IzMxLuRwamfSJZCXtnRhnLgcFR6
- VWc7J9mNpbtikAW9w0MheQj5ea3NG1Y2sPmWhCvjuf5Vk7UadY48RseW960rDS11C3b7EMzL3oAt
- 6hpn9pZu4GzGq7djH5g2PzpPDsMV/Y3Fveg/uVZl+vNJYRy2KhXfcB972q5aRw310/2eZLbcuCWH
- X8qaA4yTeT845B4qaEqjZlVtzflV+80qY31z/Z8T3ENqMs8ZAAGcd6zoZMncEwH6H0pAdDpusLZQ
- 7Rjc3ApkFoZJHmY4iAPXpms8R7oh/Gc5HtXQaALbUtGMN6ApPHrzQA/TvEdsdOWD92rRk8gcmud8
- QXkl1cZzlfapr3QP7NujGjfKTlSKzr2Jmdgx/wBX096AIkn8ucBQQjdat/bWMLZKOOnOOKzdjL0P
- BoiXe2Cu7vQBpxC0KAyK2488Hiql3LskbaDtbpjrV+3tlubYC2TExGBVe+tJNOAF4PmHNAFO0meG
- R1bI9jU0iK23zcbsdagWYO+xOH7mrkMWYcNgkUAQwKGA4JC5pzyFmPlEADt61asYIgSJWA3dOKv6
- zosFpdxPaBGVlG445BwKAMwuWADAbqs6eI/3hl++Pu1cj8NFyrRncAdxb0psElpY37NMhljD4YKe
- poAsWmm/aIjKknlsvUnoalhtHLcbiueucA1Uu9UMs8wt4SsOfkUnkCrOmXcotj9rkV0HSLnmgDoD
- 4JSXSzPNNFJhdwCkZX9a5+K9gD+XPgDdjNTpez6ZZywwPskcZbk/KK5qZ2llPmvvYnrQATr8zE5D
- N1zxRbou7951anhZNYuUVFw7dvSp59IltXdZ1IZKAGvpLNGfLAfufaqDCSKUEkgdMkVd07VWs7oG
- XLL0x60+7ePUjyCpByMUAV3bBGxsk1ZikV4gAMkHOKpzW5SUmN849qjjnlil3KODxj0oA6KykW7t
- yJW8pk4BFdxrGhwax4TS5JWWaEBEY9QDn/CvNrPUfJmBcZDHLV0s2vsfDMwt2ZYy4z7cGgDHv9NK
- yjfD+8bgYFUNRtTps4S6HlkjIBPU/wCcVeN86xKZmJlyMc5p/ifU5L/RYVmto9wJUyZ5oAy01Dfb
- qZV2xnoKbfX6NEv2ZcHHWmPLFJYQx2ZLTL1U1EIJA+2bAJ6Y5oAIboyDb0PU1c8xLkBJLna4Hy44
- 5x06VAbZbdcyZ3elNBXeCRjnOaAG2808N5syYmJ7fx+5q7tW5QCZQso/iqsULT7rXLr6k4xVi0dX
- +9kmgBlxpbI7SxqZAoGWz0p+i3txZ3AezJAHXjrWlZ26mFyzEnPC+vStzTLO3vZ1M8Yjwp6Hr0oA
- 5/xFqyrIggQKrLlsdc96xpQZ5wySbu2DVnVYQ9/MJCSitxVOQFW4G1aAOm+H3iGPSbie1upBDBqC
- CKRugwOfwrI8VWsenazNHZtvs0fEb/3h6j171Elg02N65x6Gt200i18VwwwXcjQ3Fou2NQMiTvye
- 3WgDn4riKEhkfKf3h6+9aFlGLeyS8eT5DIMoDnv3FXZ9I0iwhJFxJLMpwY2ACg1TvvISzMs77S5w
- EUcUAW9dH9qW6y6ZKBgcgdawoNOu7iWMmNiWOMDtT4Jxb5e1bKuMEHsfWpNM1ZrG4WWFmct0BHSg
- CprWivp0u193mMeR6VHa2jmQbVH0zV3WNRkv5mkn5YnjFRJGBMjRMScdKANvR7OO1u4pS+SGGV68
- d61/GnhSHUYReQyqsZXiPI64rK0S5hRNzfePXvWr5w1KIwwucAccUAefW1q8kqiT+WK0RpdzFFuE
- bFT0bHBqxrFj/Z87LjDZ/Km2ctw7Kgk3KO3SgDPQPuHmqNynv2rRs7hrhjDIcDqD6VPeafDfWbbC
- UnUjav8AeHfn8qsaL4bl2pLcYWJT85PYdzQBq6dfjRtKX7QnmC4JQH07f1rIl0SztbsSrcoQnJQH
- qaseJ7mBVT7PIXtDwrYwQ3esOO4RrxvLZmjI+90P5UAXrm881T9lHOeAOareXPH+8BKOB19Kb9rF
- pcq0ILDPc8mp7m+S6k3fdKj7vWgB8Gtj7Oq3AZ3fCs7DmorqxQTbl+oAqJJlu4gJMKwIxT3kNq+H
- G5/7o7D1zTA7Pwpd6NBrk5vQwMv3Pl+7UnjAwwXX7tFe3l5UjBbHvXP3GnCOxhuo2IL1G+qPcFYX
- cknoT/n2pbgVZtGFxZvNbH5VOBk+vt+FZ8lrPakrcqyHGcEYzWidWS3lCxAlVPUdDWxf6pa6nLH/
- AGlH99QoI4wTwKbA45pHEirjk1asbxYZCsoDYH1rV17wyumSKVbeGG4Y6gVk/wBn7UdgCpPc0gLw
- aEwtLKMDtWhoNykVwHdd8JGCjDIrDkSW1g2zOhVhkVLo+puSVlKlccYoA6Dxf4PbSLRb21wto7DG
- W7ntj61mpKdXtxaOQvlfMCSBuJrqLfWIfEvhg2muKzQoN4CnBJHT9cVyU5hEjNbB0CHABPNAGTPa
- fZriQONjqcZ6flUtqqB1SRmMr/dJzWlDaLrEUh1Qbnx+628ZNZE1s9nfctxEccjpQBO9tLcy7Zjw
- vfNQ31q9oee3A75qe2Yyzby5OKiutRMsjKQDg4FG4EVvEyfM5xnsD1q5bbzKHBAB9KrCJN4YMd3p
- V+wt8szRZUCnYDXsWSGPz7jGI+SMVVuvErXKEWuRk9QMYqXVyLXTUyRmRcmsSC4EAO8D2pAXxbma
- IMR8w7+tVdRtkUAT9ew71as7wsF2nFGsKodDOMzHo/YU0rgULe7j098qW545Gaki1FIbwzeYyzfw
- EdvyqkyGSfaw+bvRcQLayqyEnAyaQHR6gi6/pXnBER0IGFHzN15rnmlXyTGRuQHByeQau2GrS20G
- 9OhO3H1//VWhf6RprXbXmnrMtuYsOjNk78DkfiDQBi2rpHIVQjb1otHPnBZAMAdRVUQiW6Bgyis2
- Buq29q2nXJjn/eDsycUAOLCG8yg9zkcVCzeVIZY+cenekN0LqYRSHAHA9aLMCOTy5BlTyPegCxa6
- ltkL2+ORzxjFWbTXpLSV3Y84+XFVJvLilKjgVFMpAyBxQBq6prEF7bQSzA+ZJ97jpVRGjDbUJAB+
- U+tUywlJUdE6VteHLK3kuoDqQZ0zyAcYFAG3feVo+io90u2d13R/LyR35rm77VZNSmzC5SEj5hnH
- 14/Otu+hv/FN3gTWywW4KRqQM4/OsUeFZp5miaVAc9R0oAaXWa0EUWCIjuA9PeqEMbCYM3G77oAr
- bi8Gz2YDmeLc3ygev61X1CxnnuTE8TvPb9fKXigDMuIJFlBdtzHnAPSrEF0IwDCm5hw2VNRzxTWt
- 0BeKVMnTIxj8KZ/ahtgY49uT7UAX7VH1K63oERVOTxiuu0ex0nS7L7chJkm+R1kwwyPQZrh4JJDw
- zbVbk4/OrNpefLsnyyg5UUAf/9k=
-END:VCARD
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/VObject/issue64.vcf b/htdocs/includes/sabre/sabre/vobject/tests/VObject/issue64.vcf
deleted file mode 100644
index 611052907a2..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/VObject/issue64.vcf
+++ /dev/null
@@ -1,351 +0,0 @@
-BEGIN:VCARD
-VERSION:2.1
-PHOTO;ENCODING=BASE64;JPEG:
- /9j/4AAQSkZJRgABAQAAAQABAAD/4QBYRXhpZgAATU0AKgAAAAgAAgESAAMAAAABAAEAAIdpAAQA
- AAABAAAAJgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAABQKADAAQAAAABAAABQAAAAAD/2wBD
- AAIBAQIBAQICAQICAgICAwUDAwMDAwYEBAMFBwYHBwcGBgYHCAsJBwgKCAYGCQ0JCgsLDAwMBwkN
- Dg0MDgsMDAv/2wBDAQICAgMCAwUDAwULCAYICwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsL
- CwsLCwsLCwsLCwsLCwsLCwsLCwv/wAARCAFAAUADASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAA
- AAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKB
- kaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZn
- aGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT
- 1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcI
- CQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAV
- YnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6
- goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk
- 5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD8J7JbO8tYo1tIFCDLOVG5qfdaVZRwmSOFWzyA
- F4H1rLt5WViMhdp6HgmtKK8O3B+4Rhx6fSgBI9FtjaNN5aErwRjilSys7lFAt41xyTtqc2yJCVlY
- 7eqgGqv2jyLcebjZnGPWncdzT0+w0u5eQXtrGiBcIyoPmNMXwpb/AGMTSRRbH6YAyPwqK21GKdfL
- BAVfu+1SQX4jnjKFsp03dPypCKN9oEaKSkC7R0bGKpnSlSPdHErZOORXV3Ouy337sCLB6kpx+FY0
- t+VfyrgcbuCB1oAfoMemrcImq2sZX+I7ATXS618PdK1DRlvvDEaMq5LoV2nisx4LVrUfu5BOePau
- m8EQS6PY3HmFXjljKhTzjOf1oA4mz8OxvMrLbW5RD8wbByKg1LRrRriRYY408w/KAMba1pRaWt/H
- a6a7CVm2u7N8lUPEujzaRekzSK6tgqVNAGNBZJauY5Yon92GTRJp0ROY0Un0A4q3c2odkaYOMjii
- KL7NIDGcj1NDAZBplmmWv1xnoFHStfS/DFpewqYoYm3DutZ8lv8AapdyOqk8EVteEbSe3KBSrDrQ
- BT8S+HbawiiWGCAPjsuMnPesqHS4JSFlSMP7DitbXbvfrkkM2eGw3p+FMfTh5X+hr8w7t3oAhOhW
- u8MkMZUY3fL0Heo9UsrN5FFrbxKmMBgoG41fWFra0Acjpzg9aoXjtgRoo29vagCoun27kbY059qn
- bwykskYjRArdTT7GEl2UqMr2q/JtVU27iR15NADdK8DC/wBPle2iicxNg5ALH6Umm6FZ/a3ttQt4
- g2Cqnb0PbJ+tamn3j6ZCW0nILfeBORWVfO4dhLw7fMW7560AZuqeHf7MuTFcRpv6qVGVx70q2Eci
- QwyW0SsPvOqjJrUtb6S9tHQKGeMZYuM8VUs7gRxbrncy9mWgB1x4QtTHvsQWkHJVhhax3tkhugHh
- UkfeAXIFdPZ3v2uxkQ9G4jI6/j+tYun3r2Fy6yxeb2Py5IoAqXenJ5xaGNNvXH/1qcLSGeBdkSg9
- CcdaswC3be0pfexOMnpn2qaS1KQkQASKoydvLCgDNi09RKTNCuO2BxVjSobc6gqXMERQHkleDUsc
- u9VADbG6qOWAp11bLbptkjlCkZRsde9AFi5sbO3kKfZYTnkHaOlVbuO2F5thtYcADjaKXUpHj8ku
- Co2VDFL5wLeg696YFwQ2z7Qtlb8HJO0c1Zsr7T7a9kL6XazZ4CmMFRWfHdkEgjGRjPpU9raP5LSP
- j5h2pAWdQ0+z1KdG+y21qvcRqBn8qXSvC+iTu63ssqyE/IAuR+NQwSrGm1g+c8E9qiSQW9wPNYYP
- OR2oAW68GNa28k3lwGNHwvzDJGfSqM9nHBgm3j59QMVdmma4zIjsUBHy5OKp6o8s2BJjZjjAoAro
- /nysbgYY9zWmLPCR+WQQwyaz4k2F/Pbft/GtKxvUeFN+B2x+NAEptsWpZSdo9etZe8su2X7pPFdU
- LeOazKqVwevNYt7pw5EA5HIxQBQA8tAIeGz1NWIJvJlhW5OQBzjrUMR/eN9pwoXjB4qQ3ERJeYcy
- 9P8AZoA0jf8AmybVxsHAFS6jp63ixmwjIwOfrWfaou12GcDpmt/w5qJhXc6hh2GM0AZkHiRpblVl
- G0RjGMdxXQ+H/E0Rm+bjdw1crqEHm3EksY4Y9PTmq0cskc42qUOfpmgDovHOhLBOZ9O+aEnIUdRW
- QZft1sgum/1Ywua3fDfiFDL5WoEPEwxzzirPizwTFPZC60kYUjcAp4NAHPSq91EoRS3061DHD9nb
- 94Mkfw020v57GbcCRt4IIqzNcedIH2jc3JyOaAIYrRZmJxtNdB4fkGn2hluBgBR+NZ2n2X9ozAQD
- 5qvaxGbKIRXkuFU4C96AMDxBKZdQkuEUkStuUegpNM1eWScAkqpHTHNPlwbjMzExZ4Pal1PS/s6+
- dY/6vuwPSgC9G8c0A+1xEknrnpUVxaeXNm2dVUfjVazvEZAEkMrccZzV1YYyBIhJP8SZ6fhQBSmV
- 4JfMVT+96UJdSQdcMO4A6fjVmTUoJiqTOMJ/q+elRyQs0TtaxF0PVhzmgCzpd55r7YI2HHPTmrV0
- sDTF7gnJXGO4OKyNKgn80NbFhjoBzWjqdg6SISPmIBOaAKVnI1leyhsMJOD7CqOqRtZqotjiFulW
- rhsSMshKH1ogsZbmF475TKifdf0oApabevHIAhCYOdxp0t59luS0I+995uxqpdRyWsrqmXGeCR/K
- rVlZfaogqv8AvD/CaAIY42kV3K5zzn1p9jNLp6u/A80YPNWWsJNPAVpC4JAZT2HfFWJoVmVVjhVk
- HTPrQBPoi2wsoo4APtBHL+tP1mS5uVEFxgJGNqH15plp5WmyBriMRsowM8UybXTNdbrpd6A/KKAD
- xbJAGs44FIPlnd9c/wD16ynt/LiDW2SR2qa5vP7RnMs6BNuQMd6jhkAUb2K8+tADYp0fhj8w6itC
- yQ3CFYeAOoqi8Uew+UMuf4u9T2NwIW+UgMetO4FmS6RJ1ik6HqxHAqC+gimUiA8DvjrU0kcE8ieY
- itu+8c0+bShaWxksSZoM4b0SkBTgha0cq33Cuc1SvrrLFV6jpWqbuGe1HnnDdAKy7i3WSY7OT2NN
- AMulWSV8ZDNzxV7SlbaFjClx69Kpww7W3ct7jpUtnNJHd5UjZnt1NIDdt7h7NQ7qGfpt7VR1XVEh
- dhEpP94/4VpafexTy7ZlbBGDVHxFbQh1j04HaOTkdKAM5ZVlYso3E+tVp4w8gx0Bqd7QxNu+6D6V
- DIoVySxAx2NAFyNmli2pjYBz61paW3lWrFS3BwP8/hWJbTBFJy2D6HgfWtiTWPsqxraBHyOeBg0A
- RSoLSTdIepzz0606exTWyQGMXljORTNT1B7+ECZR5fHzDqapfbHjbFkTsIwSTQA43ptyyS44Paun
- 8N64Z7Bre4YlZBtU5+7XLTQbjwN4Pb+IfWn2lw9uyrIw2Z5HpQBv3GirHc7LxWVZOVI71FNp7WDg
- QYlIIGD6VvaPdi+tljb5yeAzcn8DT9YtbPSpVhDM87jJ3Htjnn6UAUIrJreD7Si7MDoKhv8AUxqt
- pGt5GqIOr9zRfLM8ZFgZGtex2nGe4zWKN8rsDhYx2JpJ3Atx+HxcRSzWcpcL/CRwaj0zW1sQy3cS
- nsFPSoYJpbIl7dm8tT8wzV7+0hqEO1Y4lQ9cqMn9KoCp9kW7kaaxU+Yx+5j5etWrb/RGxfr5bkdu
- lW7KFILpfspDbVyc1fjNnrLtHqOYWP8AFjGfxpAc/e6Ql/GzW4AfqBWfpupS6Xer5vPlHmMjg10V
- 5pp0u4JhYNGvAYHrUn2WLWrVo41AvSMRZAC/8CPr1oAvafdWOuNG+lqDekY+zg8MPXPX/wDXWZrF
- tcWNw0erKElB4Rf4R6c1BpqyaBdbrnEcwyAc4x06H0rQS9a9jUTgOXPzMwycexoAw7u1jYb3zkU3
- Srtgdk54PFamv2C2pDQbWjcfKCeSa56aJld23YA6ZOKFqBrXGjjULuOKxKuZOTn+H/OKwr/ztOvs
- uCrg7RgVLYapPbXAEW4EkHJNdBNBH4gtgyhFmXuw60AVpbT7VpiPJ94jLetQWsDRSIYz8mec1c0+
- 1nexdrw7GjJXk/epsFtDPG0bOdw+b5SaAKWsXA+14Y71FQi5S4RvlAC8A0y5hHmHarhvQ9BVGSQx
- sUXPHX3oAmDCJ8rzgHg96gQ+ZGWbg9vahNRG7EnalkkF6hEXyD270MCWF3aEhdue1OsmNnMAih/r
- VaBgAUY8561PaubdnMxJXseuKANhIY5Assp2v12itZtAgubEi2nb5xuKYHWubstQaO6SVzujTqpP
- X8K2rXWLRF8xZJPMfjAzgUAcxcNiaRSpUocc96sW+yNgZCMVF4lvJdRvTOYkj52jbgZ98D6VWmlY
- 2qCUnJOKaVwCzviibANwYc8Utkdl7tbKhjxmpUspvm8tgn16ipigSEG4G4pxu9TSA27GeFbRlGGm
- P3cdhUN8GEP2hV3JjafrWfpU/wBmuAcZLA4/Sr1trkarJHcRmSEZO3uTQBmrcbZCLoDZ2x1qOHSi
- yebJIAPQipp4kmbzI1EQJ6GtCxsoHP8Ap91GB2yDQBlSWO+M/ZsBHHzZ71XkfMIWNgGU9vSt3U9N
- t9m21uonz0Iz/hVCfRkjg82FhtHDGgCuZ8EMjDZjBzSZ8pAwU7XbGT0pWtEjjAZgV4PFOml2QKqk
- OoOcU1qBNYRSrdkrhw3BIrah8KwXoV/m3PyVzyDWNp999kccgZq/ea7PFAGgZlJ6EUgN23thpdi4
- V1Eucr7ev9K53V/ER1a/MkuWdBtG04zioLrXJ5wDK2XAxmqVqmZ2YPtHJ/GgDsvC3i0ppr2d2ish
- yFAHIz706bRLNdOPnErKw4y3NcvZ3pjA8o4kB61o3OpSX9nbx3QIkU/MwoAj/sGaPzFjlWSJjk46
- ioYYwqssjIHHAHpWm4ESN9nYDIFZV+I7uVI1wrY5b1oAtafcvb3W4MM9Nx6U/VZpNRys54ToU4zW
- KXaDKrJuC8cVdtpi1gzs43HNAD9N195bdYtRIUR4wD1NX2KuA9uThuSQelcsZwzq9xyzfezV/SdX
- e3m8pXJhkPKkUAdYZk8RywjVVJES7U2cE/WtA+HDHohuY3Uxg7RF/GeaPBlxaawMW6rHKnAU9SOO
- lX/FFv8A2bpzTQk+cpAAz93nrQBx+r4c5CODEOA3Y+wrKu5V1C1GFKznkk9K6Wzv49fs8Xf7y7DY
- MhGNgrmtX0s2t66WknnKvUp0/WgCnbrJFdot0NwJxkDFdDYp86oMjjIArJivxbR7LuMyEjKitS21
- MW8auuW44H93/PFAG15aXdr5Uv7uULkA/wCFc+Yvstw0at8+eoq/p+rm6vRJMNwIx9KranYySXSy
- WEZZHOCw7UARXFyj5STAk7ntWVf2gALLyfUVoataLbfLO2SO/Ws2c+VwhLK3QDpQBmz2xAyCG56d
- 6uWPlnCkFcjoTzUBkMc/3cZpwn8oZkDFs8HsKALN1apDIHOeaiLkRkMOtSXE6yxAsRUcdxldswIJ
- HANMCuJW8xQgOP51oacWPPGAeRUUOIZQzDhecd6mbIcbPusM0gLmq6bHPohlhDeZuH4c1zzF1+Rs
- HByDXTae0s0IhjjZg3GPWqOs+HpLCTbNGyb+cHrQBZitjPEzW/LL97vinw2v2m2aORec9AKXQbsw
- ygBBiX72TWxfaS8kiGFQAwz8vWkncDlbqNraT5cjb/n+lMGckx8kjOa1tU2TxkPkMpxyKyrhJ4Wa
- KIDbTAkgvIp7URzgBwe/BpZYrd4vmZWNZ81x5cgBXDdzVlIvtUOGIBHpQA2aEROpR8DsB2q3bvG9
- iySzEsTkLnrVMqViCZzt7nrT7GBVuQRnODQA6Q+Sx80A4HApEJB3BAR9K19EmhkvCJ0ZsKe3tUc8
- Mc1yy7cpn6YoAzoUiclnYYY8AHpUl8zRxqpPy9qtC2tULgSMAvQ460lzIl9b7YiDt4GaAKMMQlJ5
- z9Kj8gIW5yKnS3Crlzhh6d6k0mbyZT565Q5z60ANtrRpPmhzWhbwy7DJcDhhwMdKlt7aK+gb+z33
- yKdxVuMCqaz5cqGYfWgB6yu8rBB8o6Gs/UpjGQXBGPTvVmSfyImyepqrqjbIw3WgCDz1ib9yOTg4
- NbVlNBJYvlVBHt1rBaPzQWU4IHSn2FwRJslJxQA6e3M0O4oAzdB6VXR2iKGQENGOK0ms1eAkFjF/
- BjrVGaAo371smgC7pety2kwl06Vo5AOWXmuwm+Itv4g8Ota30aWlySAJQfmkP/1zXIeG4Y5SVBB3
- evamXGly2tydwG0nKkHpQBZ86fRbpBLI252y4PGRWhO8Ml1IbJhHn+BTnNU9O1oRwvDqqhB2lHJP
- 4U6awb+z4JdKbzdh5ZurDHtQBat5LaRHiaOP7QejEZKD/Oauy+FI7W3Bsroyhxkq3QH8q5a7ujM8
- nWOQnBqTR9burCT98xdR60AbbaHc6ZG3ymJsZC/3hVnw/fNIXt7hygHzZp2oeIBqCxzqfmCgEe3+
- RVdrmLVAEtf3bxfOW/ve36UAV7+7DXMu5Q4/Os2e3eRWkiAGOijtWrPodxfQmeNVAPOPWsppJIpi
- JxsKcY9aAMwRyTSbpflx68VOYvOXb97OKtXAiZdzkqT0AGc037BIIRLHjsR60AVprZrZwGj4qTY0
- xyRj3PUVMJDduFfqvFRzxJCzrCzEr60ALEu+YI53c4qeGB7lGCnBU4FUopTBLvfk1at9R2sAMjNA
- GtaXsnhy2FzPHvC46jgnNQ33imTXrkz3oVFAwo9Kfrtq03hAzEfJ5gyc81hWM5hhKrhgT0NPcByS
- P5g2uVI98Vp6X4uuNGlyzCQIQR0bI7/1rNQxqW+05J7Y4qK5ZYUP2ZCW9TSA7SR9M8V30X9nMFZw
- WfcNi5qPWPDtjo0pE7O03U/Mf055rmtFmN9E0DEox+atPWbiW7lSO8Ja4jQbcDC4A9PXFADYtM0+
- 6nc3u7aOm3IP6Vnak9tYt/xL/M445zTIbieOdmWNsE46cip42EkyC4hYx469KAFsrT7XEJgFPOT6
- 1s+H9PD3XlzxnL/MDtqn9pghgb7GjL/eJORWqfEnmrA9oFRoxjJ5BoAp6NqDW2pzRXtuyIAw3FMf
- rVS4iF08pydmeCDxWvqeuC+Ro9qglcMw71mwReXD5aAlFJPPU0AZ0cEsbkSZKH15FD2xJJiJVj6c
- VfnzLGEXAA71PFpDPaebE6/KOh60AYVws8TBgrFe57CmHUG25RVJA7AVozzSLbNvX5T1AHNY/m/Z
- nPlqwDetAEtvqzJNu3FZBwQBjI96vPqkd3mRtokH31UYx+VZqWruxaFl+frkZxT1tvs1ujJgEH5m
- PR/pQAXl2S371XAHI+Wkaf7VD8hGR2arKySylRccQ98DmiS0jifdsdgeODQBQd9x3IBx1xTYlBm3
- En86sXUAwPswKg9QeaBErIEj6nrQC0NHRtUjt0K3AHzDABGcVW1fTzJL51jyOpz0NVooispebBI4
- wK2YFEthk8qR07igDAgJil+TKtnnHFaP2h5yI3ZsgdSfaqd2P3im3BGM9aktsjmRgCOaAJZrMwR7
- 3A5PT0pdMvZtOning+byzuVDyh/A8VHczSzDPy7RwOKgiuHEewjKeoFAzp7TUNM8XXEw8RhYNQmP
- 7ny18uNeOM7cCtMfDiS8uY0tDEYghyynjPbn864htP8ANhLIehzWzovxDvtFsDB9+PI4I/rQI0r3
- wNc6DO0N2VaQqW2q24YxmqFhYRgE/vkkDfMGBBP4GrSeJ7tZd6SxvIfmK4yQP84p0XiyC71gS65G
- 00zAKGX5Qv4UAbFpd28WnIsBLsDzmub1+AXt1LJEoQqfu4xu+lbWsWgs4/NsCXjPIbqK5+5kklmE
- rDD54BFAGb5cjybCrAnnB6ipEvXil2sM4GMVpFY7m4UNmNyOWJ4qteaM0BISVZe+RQBFHC2/zISg
- B69KlIVhIHA3HuR70lqotlBulY5P4Vcls44k3u6N5oyoHb60wM6O1SRir5LemOKv2vhuW4iLg7VA
- 6k4FTR2ax4aaVIwR3HWqGua5PcQm1WRBH6jqaQFzWbE2nhzynuIi+8HaHyKweJSEQEN6jpVcKyOw
- cMVznOeKmtZvOPDKuOKAJbi0JYFf4eue9IW8sncfvdqnlvVFyFyu09abI0bysMZx0oArC4eCTcgb
- juK2dNvE1N1M0ohljGQzc5A7cfSs6aweWAk7kTuapQysIT9mOSvG49aAOkvzLMxk06QNuG1l7j3r
- PlnnJAuGJij+nNQ6XqT7wEYqyn5v9utLULaW7j321uiEjLqMkKKAIotbghb/AI8hKGPIBHNXLG6t
- 7uzk3RLbKG/iP+Fc+8f2d1eFztzyD2q5p2oCFWRoxOX52nPFAGgLyC2lyZFKdB70r69buxRJBHjr
- nvWVdeXLE7xE8fwnoPpVKZUnQPkBhwRmgDq7a9tLyARWiiWYngL1qG4gurJ28+NowO2a5a3v3smD
- aa5WUd1HNbC6zI0KSX13JO7D5lbHFAE4V7pi0b5x1GazdUtXSM7v4iPw5rQ0/XrcXX75FgUdxzuq
- /qFrp+sWRe3uDkc4BFAHLRDY42ycd6uPOXiiV+RGPlWnXOg3IQvEmIB/Ft6/jUUEZmMcgydvzECg
- C1G2+Ly3YAvyM9qY88kaFcmmp807uwPJ4FS3do+Fzn5ulAFVrjbgS8Z4yah2C03SMffNWZdPknVA
- iluQOnHWmX9pILvyY13HHK46UAVre7LSyOCTmtjSiy7VijLeZ0IqO08OzPIUiTI74Ga6bRP7O01F
- h1KYJOv3V4BoA4zU1lExMrkbOAvpVcSifhjgrzmtjxPp7pO7SggOcqfUViy25hG5fSgC8rrLAojb
- d7d6SexlEgwpRfTNV7e5LFBbKAwPNWHeX7TguxI7GmBPBExhaNVIJ6egqOVknO1fkx1J61aj1gLC
- UEKlk4LVWvozC67kCFxkD1pAQ24e3uDLC3z9CR3H/wCqrczJdOGiOxvYc5/CocMYhtUBj3xU8Qjk
- XbKPIZOjqclvzoAu2HiO60xPKvd7wY/1fGBWnJo8WuW6y6XIPMYZEAzuH9KxISonAuzuRzgk9qtR
- 79KmMuhTt5cRyxznFADLzS2tMw6pAY5OoDEZ/Sm20TQQ74YwVQckGtMatB4kUpqreVIRw5+8aqXF
- jc6bAsbD9yThWz94UAOmmjvrRCMJjOQRVS0sD9pLyABM5Of6Vdtrdn+RUGcZqO6uRBG0MuFI79KA
- MfV7r7ZqDI7kohAVT6U2eJNimJQOuTnpSXFussrMvBz1pJov3YUsR9O9ABblRncQ3bAqY2EUwIiA
- Vqr20ojfYqZx3q9bSKAGcYJPIoAoq7OCEQBffrRDGEcleM8nNPjuGkhHmbB74ApvmxltsuTnuDQA
- +SFEjDwu5buD0qpLL5vMg2kEdOlXECMAyZGOMMePyprQRI5N0rt3BXO326UAV4b0Wt0pC5HrXS2W
- qq9zE7jcO+OhFc81kbg7iMqeAFHSpLa8eymaNOUIwD6UAavjPQYYybq1bBmXcF9O39Kw4iXdDKcE
- DAxW3q7NdWELISdiYIz71kz6ZNZNHI0cjqQfujIFAEtzAtu/7vODzmqlyzNyAo9vWp7uWSWJd+AM
- jjGGqOWCSWRVVW2+uKAKskpWU5TP0p8c+ExsPPNTmCVD+5U/QrzRJHJGymeOQc45HFAFczh497KR
- jirWlEsAudvII9znitEeBp7yAPZvEVPJUsP5ZqCO3j0yYDUNwliI6dOPpQBt/wDCR3Wj6eHFujvI
- do3DIX9KoHXoL6J11CJYZAONlaWueIYtY8Nwx6ZHu2MdxVeTXKG0eaXKRuCeuBQB0mn+HRe2Yeze
- MqRkFmwfyra0rwsIrRmvZICcgDLVw7xXFuFd2uEQfeAJAxUkkjSxh4J7gjPAErf40Abvjq1i0y4S
- KByCdrfL+FUI7SR4Wc+WzMOCW5qhf3Mt9cCV2ZiihRk5qpdTSBgRI+R2DnFAFw2k6AqJZMjuD1qn
- cxzyyAkPuiP3ieT/AJzV+01R7a2RpMZPVmGQ1WVuTqLDCptcfMBwRQBEkst/YMCSTH8vJqtJaoYQ
- JPv1o+ZDZKAo+UnBpmrCBpRNp4/0crgZ9f8A9dAzCdGgkOynxSus2xjkj+L1qW5/fxYj+8D+NRWz
- R4fzCd2O9Ai0lzI6mPaMOcZqW4uI7rbtJ3IMc1XScKqncQT0olPlKWfBz6UATKjSDcmdoFWtPCyR
- kzckHiqUV0623lKVIPzHHWp7Ic/vSRz0zQBcCqdyT4J7YqC3uZdKv1a2UupO7B6H2NMglMUsmcnd
- 0Lc4q3BmaMBiDjr60AWJRBfyb9P2RueWJ6KfQVLHqMdtcEysxJXayN0x0yKyWihWQBdwTOSdxHNb
- zWEF5ErXhX7QQAMNge2f0oAnhs4rq2kksHwirkg9SfauXnJnmL3AbL9jXSRWh0N28x1cEfMqtnA/
- Cs+70+O9/fWRIb+76fhSTuBimbyyyKDgnipLk7AML1pZbCWO7Hnjn26U6ZykRL+veqAryuvm/Jwf
- Sk3mo2AyHyCT6Ux5pLU5Gwg88gGkBPNAILUO3KmooyjL8ueegzTvPMsRjG4qBwKrW1sxJZzsIPGa
- AJbmfp5q7MZx71NZawEi8qZSyHg4NRGLzCPtB3eme1R3Nutocodyd8UAaVtqEUDlI8/N3PaqV2Ht
- X2x4lIOSwHFSWkEFyo+cD1BpbmNbNdkh20AMh1UiJ1c9RzWj/wAJa1vYiK1RmRvvetY5gDENxgnp
- UlhN5TiI4O4845oAmu51lXzFDGQ8jnpTra4uJkBAOQavXvhG8tIhPawvJAfmY9gKE1COwgIiAZiO
- 3rQBV866T52Qsw6YrXguZNTs0WSJ8IPnHr9KwZNamNumZSpPU4pbPxBeRy/uJjtXqfWgDodMtnXK
- QjYeo3VnalpiXjMzXMKS9O9VV1ydCXkmLY/SorWwTVJTmQEt81AHTeCY49Mik+0SJKmOg71W1bxH
- HLdgaXaSRNnjdzWapGlBBG2ec4GKtQ6yZD5hjLMvbIzQBfutWC2ajV4ywwN2OM/Sql/JY2kKGzU/
- McnBBqlf3Lam5e8lKMv3Yz2FU4VjgzsGQ3WgDa0ya0u7kxzgqCCcn1q43hizkEjRkOoXcAOua5Ka
- 6Mc3ygEVb0nW57ac/ZC4Xuo5zQBBeZjcwuMxRn5fUUmnySx6kv2cgg98deK1LjT31pTLpymSVuWi
- Xqv17U2GzFgFBUCVOo7igCTT7cnTp/ty5ZnyCvGOKz2uwimOY7geQB0FWY7tzu8xiqk8A96qOvmy
- MSowOc0AVpkkgk3uAiP39KkjtonYtnO4cKOP1q1Z3K+X5V2N6OeM8gfWiewaxiKhDsAyJB2oAk0u
- 1juAwniYshwoB61FLZfaJDv/AHWexpulXRNwpjkP7s8nu1Wd4uC7zfezxQBTjxZTHzlMigbdy8Up
- YXEv7nPvk1aNqbhDhgARnFZMCvbzuWZgc/nQBo2l6qs63AJA6VIsiG4DI4jXP8XeqcbrK5JH3xkH
- 0pWhWVR52CF6UAa8kUd7H8rD5f1p5txHAfNPasWRCjgh8D0BrV0a+DgCdfM3DaB9RigCml/JFPyB
- 159xV+C/wfNHAbtUN9orxO3k5dhycfw1XmT7JarIjb1k6U2BcuNSVGDSAPu6be1QTXcO0CVSwbPA
- 7VRtpftEmxW2Mx6HvUv2V1J2jkdaQBFJB5jBVYemetRyW6SqTKCfTFNllCHBX5vWkLBPvk4NADTG
- 0ePKB5qdLN5NjycqvNQIpZAFVj71LsaJQBuGaAH3aCVwycKODUMsZgJjxv8AXIzUs0DpHhmBycjm
- gOd37wdRjNAFETeTcARAbSeTViApfrhjufHXNJNCsUu18Z61Xit3Q5JxQBdW0MYKyn5hSf2BPIjS
- 24I29T6f5xUMMrs5HOF71ooVmtMyu3ynAAzQBqeCfG7aaPsmuYkiYFG3HseKq67YQW2rSNpLCS0l
- GQ5GSh74xWZc2SyxK4OZl5x7d/0rV0K+j+xPFOu4Pwpx0oAo3OnFreM7AR9Kp/2eYpxtyCx6VoXd
- g2nSlQzMh6UxJdjqSpKgfN6mgCOLSZGkKyYw/wCn+c1YltRodoWA+Y8Z+taPhWz866DQqxLdmq34
- x0ZbS23yY3NgkUAcZcSyrjcc7zw3YU62meOeTazdOhrZ07TYLkYvSFVfmqveQWkDj7CW9zg0AZs9
- 8wbO3L8ZpvmGRsyZQDsO9WLu0EwZojwMc1DJCrsA5we1AFmGVZLc7Y1bA6nvU1gIyNzgxtnoKr7I
- NgHO8dx0pJ3AYG3UnHegDRS+NpL5lsxh3dQverj38OtL/pKCKSPhWU/f+tYEt98xMnC9qgludrrJ
- GzFl7DvQBq6pYNGdzHGO3aqS33kEBhlSME0+01z7OcXGXRupJ5H0q5fafFqNuJLLnofmGDRsBmJe
- DzMEZGevpW7o8sN/bzLqTBML8oB71k/2YYh83FQRqbdtr7sDv60AX7jSo4ZsiVo067hj9anuNHey
- jVizMj8gkdaqQyi+UxjO7O0A96tXDz6rEFucp5HygUANGEQKjDJGaqzWbzgyn5QOPY1p2xZtOaGN
- VMo5BPoKqxa1NHHtmij+Q4xkUAUraZFiYScMOgNMf76CIZHf2q5KRq8arEjK4OTsGaki0oKwAEhP
- uDmgCohEsqq/O6rrMNMj3AEdgfQmn3tqUgEcaYz1JFMtLdn0wpFGxYHhjQBa026M0XM2WQ/NnHzU
- 6Yw6tCPt6rbpH0CdvzrPtrZ45ceU4cHk9qtzW6XLOjqwY9+1AEa+HWun8zR28xU5LAZx+VLaGSV9
- jrkr145amvEY4hGkjKMg5XoPY/571vaHFDr95HHqDMkoU4C9G+uKAOevoo5iSBjBxVYwLdRkL1Xt
- XSeK/CdzpkjRMqyJ95SjbsD3rmJbUwoeuGOCfSgC9eWc9rcbbdA0KHPmhcq39Ka8e9DkBS5zk1X0
- /wAR3dvEtuTm3AwVzW/D4w0xIEivbOaSTAVWBAH40AYMu6CZDkFcHcTz6UrtkYlwVHIwOtb91olr
- qtuRZSL5h5EX8VY97pc1jKAqZ2jB/wA/nQBRJhubjE4YOOnNMC+S+DzmrMkIA819wPTbjmqwfzcM
- 4w3vQA9mbYwgIz/ENvSm2t+6jZsYKeTkVYjn/eqwGAOp9aeW+2sdkgVf5UAQLKY5MHGferNv+6IM
- XT07CmyaeZIS1vtmkUdQKbZ+akOZoyqMe45oAvRzjUJPLLgSds8/zqyPDzwETagy4U8YwARWMbcw
- NuDDePenPrbXEfkTn5hwrdqAO709LPSbbzlZdvqD0Ncnr/iufX793uWQrGdmFGBjpmstdQeFRHKx
- 2Nn5f73+f61E7iLCxDnrjvQBaubtNypAxyRzg0q263DMsJIzzyc1mwyDeSD82e9XIGUIrSyBNw+X
- 2+tAD3tSpcFvufrVZbdL2XbnDdjnGKnhs2nkYtcIEJ6461HMiJIApBVe5HWgB8mmtpzDzSrrkZYU
- 65mRGYoBgirEkCStiJlC7c5IqjLNsYhtu0d6AKkshbAZcAdc81Gdwb5SD6cVZjYy5WXBVu/pWppn
- h63urfdLdxR47MDk0AYjnhehxntVq11OVANuTj8q2/8AhBZ7mwkm00CYKQBtHXrWe+kTWS7J4zE+
- OQ1ACQX/ANrkC3DD0wODV280KQwM0jxheueKdZWcCrvkjYYHUHvRe6jFLapHtLKeDjg0AVrDQ5xd
- xuhIUEMHx8pH1roZtH+2W+dPIbHDMOcms+81YNoqWltlFKhQD1HNP0e5udHsHFkcyMRkDoaALUPh
- aa1n8yUgqRgjPOO/eq+reDkvHzoQYIB85JzzW5HBLqWmCSWQJM3UEdB3/Sk0S3uNPmIkBlgJyXAw
- o/Ci4EHh3QYfDsfm3mHklGGLdFqS91HSYpvMw0jjkhTx/KqXjLUg8hihYiMn746H6Vg+QYxuV9vH
- 1oA3xrem38TNe28rqp+VUyD+gpbTU7O6ylvEYoEBPzjDAjp2HeuUk1aeyfNqMH+8BTrvVhqEAMuP
- O7n1oA3X1Q3U0klp5S7OGHFZt7rj4DwxlTJ6riqMTiDZsHTn6/WpbfU5EP8AxMVMqdFIOMfWgCZb
- lpEO/GDgn9K6bwZpktjcC7lUsAMYPvj/AArBi0lrpc2sqbZsHbjkV20SvDp8UUZBcDp60AY+ueIZ
- dIu3Frh0lbD+YNxAPXBPSqLrpuunyNPBSSM7mZyQpJ/KtWQ2uqvNDcjypQjAFjnJx0rhNYhntbvy
- 7jcucgIe9AEUMOy5ImYgg4xViVVa4UFSoToc9a6DxZoEdqv2rTsHzDlx/dFcujFpG27vlPGe9AEi
- anPpV359o7b143jqo/yP0rWs/FSavF9l1JltlB3tOerd+axl3XGfMXC9896iu7UbtyYIxg0AdTc2
- Vrqe3+zZxIF4Uj+I1S1Hwpexu0kts8aL7Vg2t9JZ8REjJ+UD+Guh0TxjeaW3/EwAuFAxh260AY8y
- ujfLkBOCOuabHcqgCxYAbrz0rsbSysfHdzks1rO33Y0AwTWd4h+D2r6M5mmt0ER5D85P1oAxLfWZ
- LSYrbnAb5eKnudVnyELFkHOcCqUmjzRzBWyD9K6W38JtLo6TtkLzmgDHtryGZiZUDZqDU1Vl3wp8
- g+9jsf8AOKmGnw2cpE8jFR1I7VdGjRXMQa0kdoSPmHrQBn6bYnWz5NydjgZVgORWeztBK8ZBJQld
- x6nFdZ4ZtoNI1QPI7O+OB7VX8faO9rdC7ESrC4BJHqaAOcgUTtuORiraW0M9yiXLAIeoPc+1RWar
- u6Haxq7e6ekEZkBGzGVz1ptgVprUw3ku3iJDgDPUYFEzAwZRN2CDgUw3JEkezD7+xolvytwn2pVV
- RkADv060gLVlMk4aLIDHp7+1Vbu1+yzgThiHOOelElyIZl8v5CDkVtxWkGtaYs0bMblCcr/KgDCe
- 3LzsN20L2HepUQJnHI9KsX+gT29pHKCd79qWw0u4aPcwU4796AL+meIr2G1aDSbiWHOMhR1qxZXz
- xXBl1n/iYBBlg/FR6VZW1nciS9mdJADgYGO1Q3pIOOu5hz60AO1vxLDqluP7Pt47eJSQ2KzvtiSg
- eWuPpU89gsfzH5cc+1ZaSpbXRZT8tAGjjz237gNuPwrc0O48uUPOM4GBXORXC3HmJD1bB/QVZivZ
- fLwp+71oA6fVfEiwXC+UBGjfKTj14qZbi7gtJWjkY2zx5C9s4rnbCRdZiaOUkFQTke3P9KbYa1c6
- XcBARLEWxhzwBU2AotqzH5Ls5YdFPOKmiu1KgxfvCOqHrXTL4EXxLbl9MO6bGRkYzXPal4TuNLu2
- ju/3csfUD9KoDO19yChhO3OcqO1VoZEUbHVckZL9x3q09s8a5uDkZxUDWX2i4OzgHvQBLCwkwyEF
- c4z6VNDZm7utkROCfwqCzAhuGRhhV/WtR5okjjkQ7ST2oAlSRtMdUjHzR1p2OuOI2Ly4kHQViS3K
- iYBMsW5zSNF9klEjPnPSgC1dzm4uVKSMZd4JP41oeJPD8+r6ZHLbwmW5H3yCMqvr/Os6xu/tDfvU
- CqSOfWuj0yf7OxLO2CAG9x6UAZs6vcIqSiVw3GQMisR7RVvpFkGFU46e1dN4c1hYmCXm0quDIO9c
- 54quVl16drdDHGzZX6UAV5bTzWIi4Ws6/DQEoQSpI5q9BfywxkS7WU9OOlMa3F8hG7bj5sn86AKc
- ErggKVA96lFwLcYHX3NQPAHnYD5e26pAnluA/JoAu6JevFqsEqs4YN0HQV39p8aL+CJVnWKWOP5c
- OAf6VwCzrbxAIMMefpT48zEFD9RQB6hZ+PNE8YqsfiJFt5GOC0abcH6ioPF+i2/hiGK50xmuLOQ4
- AjO9s/T8a8wlzLIdxKkHIwcc1s6R43vdJi2xurxsdriQbto9RnpQBal1C1urtzcIVjfqu3FRMNM8
- zbpplViehyAKnuU0/X4N+ixtFdR/67e2fN+g4xzWPcWzWFyDL8gP3Qw+9+NAGhqulSWzpJHt/wBn
- Bzj2NejeHLG28f8Ahox6/HsmA2DHBGO9eTrrksUTKSOD0Par+n/EnVdMRVsZYgpHIK9u9KwEvjn4
- eTeF9UY2Jie3HI+bJFc6b6eMkt909j2rsrTxpYa7bGHWYpXlc8Ord/yrOu/B8gEjQul3Ao6RjLL9
- cGhaAcu0skr7mK8HtTjEAcMMk881Zm0l7JXxg7uQBywqqzysygDBPr1qgHSWqzANL6UunXjWBOxW
- KsaZcggbu4HSlindrf5ANxNIDqblPteiWrESNC2fujJ7Vd0bRY7KLfZswWYZYSdT2/pWJ4Q8ST21
- 1b2krIYj8pBFdd4k024ht0nsdpjA4AHNAHO6npkSs2SwPase6ieJcSYdenB+atGbWykgF9G2cHvi
- qGqMxiWW0GFyCSRnFAFeSN4yGiLE9we1QXYEhzMo+bnAqaC9YzbpSGY8CoL/ACwDQ80AV1mxdJwQ
- q9h1qd71WHU/QdqgDO0gJAyevFE4WI8dW60AafhzUHt5v3ZAzxVzXNFku/38Odg9KwbK4ELA4z+N
- ddourgQKJsMv92gCr4Y8Qy6VGUmkdLcDjn5/8a6vS5tM8SWTG3kkaZeP3xIyfxrmPEuk/ZXF9akG
- CY/LHj7tZy38tvcxSwnYw7DpQB0viLwrIigwhcHqAeKxDpbmcgJtKjOfStXRPHgjlEeuAzZ6bf4e
- lajX+navE4gZIyQcFmxQBxd5ZPG+9iuDxmqitHGR5oO09M+tdDqmjNsDl90YPBHSsJ4N7uH7dOOt
- MByxj+EkE/d5qwYGkUNu+VetUgxVz6gVNAryx7Y84J5PpSAeZWjG8A/Lg1sabqn2hF8wnniqPkK6
- qk/z/TilaEWo/cgqKANPSbRba8zM6MXGDzVPxHYPPOzOOVPy471R03XmSRXlQEHv6VstqaakgJKh
- h0X1oA5jBjYrP8uTkA9TQ0qoxLHqPyrQ1+z6TMu104x65/8A1ViSsVc5GdwoAseWbkDyQWC01QVv
- S+5WGcbe9OguTFZqIjhxnPHWnWTCO6LyKjPnpQBDfs4n3sMc8Y7VPBKWT922498U7X0RCjRnJmAL
- KP4aq2rtA/ycBu5HXFAGkYg0GT8rY5J5qIw5jyMORxU28zwAou5jxj1pnktAzCUlT1xQBHFP/Z8w
- dpNsg6ccj8a6jQPFNjqdqbfxJbvPM/yxTE/LF9c1zsNsJ1U3EYIP8VPe1iicCORsnnHTBoAtat4Z
- mS92Wn79WBK7aw0ia3uXW4jdChxkjvW/Z+KLjTZFd4hKwyAc44qy+nwazpxEOPNdvMdx1UdTQBzb
- AbSNyqGPf+lWvDPiW58IXDtZzOIpRiVVON4qS/0ePcG04/aYV4Z8YwaoPGJrgq2AqnAPY0AdVdww
- eJLX7XoxSKfbnyRwzn61zGooyMzsreYpwQTyn+P/ANap9NvX0S4DQtzu7dhW/rel2viWzWfRiPtC
- L88a/wAfuaAOQEvyDepIOOamtbFJZWKzrH7Gpk02QRBLgYYHkDtSTaf5LBgM7u1AEVxbS2aiSNfm
- xw3St7RfiTLFZi2vUe4VRt44xWJDczTzoLoFgvO096bMomlkaJfI5ztFAG7Jqdlrcm2WNYHA+82C
- KidbiCAoVLWzfKoHOawo1dyGO4bQcc9frWppOvSwQLDcDzQSOvbmgCjcWBQsqDYwOTmo44BdAZfG
- OeuK1NYdZLjzCdu8dAKzpLYQt+6OKAK88ciXREQ3AY5/Ckmt3dlMoznPSrMU2zJxgD2zSSRmX5kY
- gdiO9AFWO3KSDgqMjrXQ6fYuUAjG3HO7rWRawNeSDLYKnHPeunVG0bR4ruTnc20g96AHxn7ZbNA7
- qzgcVzup2s2mzOl0CAT8jYzvrb1TxpZ3tgr6fBFFL/EUqpp+pJqpxeqJAPulucfSgDDfcjgxAqSP
- mB60xXXlZFBPXpV2+tms5W2oTnpk1nht0uZCAfTFAG9oOvCJBb6jueJj8qj+Grer6XFCqvHMvHTA
- zmuajlMUmWHznoKvQ6tLDEPtKeZnsT0oAkaBVLGX7x54qOG6NvkEEA/rV2dYLi08y3fMhH3e4rMR
- mkDLOMkHg9KALcN7vXI4Iq9ZyG5jw7An1rFuWMWMAopxTzqMkIxZAuOpINAD7ZAcg9F6VqaXdRFg
- pX5h92sPzRbfKQdvr61c0+4MjDyxsYHkkUAdA2lvdQ+ZcDIPGOuawNY0wWNywjwVbocdK2E1ubTF
- +T5gw5yM1Lc2kOqaX5kXMxG4nPT8KAOSUSKu5VGM03aZmRo22k9Tird26Fgp+6hwcVAZfNmCnBVu
- mKAJp7N71FDcuOI8d6pJlLlt+d44PoK0dTZLKCI2HmCZQCd33c+1R6iqXKpJBu34+bPQGmBNpzND
- bgH7zHjPapLiXMhEvzMRwarQXG+ILcfMP7w7VZjdHj+QgMOmaQCRF7AsVBZO2am2G5t2kIAJ9O1V
- 2vzM21l+UU9Cjj5M8eh4NAAIXjUeRl8/pUa6k1hGFtWyG6n+lWYX25Y8dsUs9t5tkVkK7Tz7+tAE
- 9l4hAj8q/RUf+Db0P1qZ/DUWrTO0paK9cfLGg+Qn61zc0SeYc53DgVr+HNfk0u623LgwSDaxHLY9
- QaYFa80a60G58vU1VmbqF5AFWdC1k6PqaTW6qyEbSD+FdRJd2s8IikZJbO46MTmRB7nr2/WsrxD4
- QjtohLo+9kHXPb0pAd6uh6Lrekm6hkkQSRgNtQfK/p+dc1f/AAsuGUnSWSVScgynbisHQfGFxpki
- RKw8tRyD0z/nNWPFHji/1lFihkCxKMAocUAaNt8NNSt3bzYrYsnT5xTLvwZYQTIuqzlLh/vqigqP
- xrk/7QuIwRHcXG4jnMpP9ary3kzhvtUkrSH7p3E0AdXqPgvT1vI47K4kfcCcYAx0/wAar2ngu2uW
- ZIJX3pnjHFc3DqUikfPIGHU5PFb2ka3PDe7dPZGGzGW7/wCc0AX7LRLSzcxb3eXrhhxVG78JeVcA
- bvvcVfEgudqaoyrOrbiV9Pwpmo311pMnmWmySH3w1AGRrXh6TRfLMq8yfcHGPxqxZ6fpmnmNddml
- jlk5+RQRx/8ArqO51ptT3vMwWU9iOF/CsOZHnkIkYu3YnmgDo7qPTtPszcWTu5LcAr1ycVl6p4hk
- 1BRbsCEXkCqEGqz20wEWGEZGAeRxVy+vRqV2JpUVJiACQMAUAZ0+mvaNuuz88hwAOmaktbt7C4Ub
- c8jvW5rGkp/YUEsRM0nLSf7PFYogSWEF/lJ6CgDWcjXyuMhwOAO9Y09hLbSyKy9+pqzpM9xo90Jr
- co2OMMM5ropr2PxBYGK7VVXBbIXG4jnrQByUI8xSADs6HPWpPLIjGxssvr3pxQmcqx+VGwFHenJI
- gOF5oAW0jZB5nQnnH6Usnzjrg0rW2/8AeISD1x2pWR5VySNo60AQBX2EzHIXpSQJ5kjOOFpLgrtI
- iLFvWi2Y3CFYuoNAEt4myTBBQ46Gq6OyHKjGTzSyyyXUm+/cnHc0+PY42RtuDcDigDS03UzdQlHG
- WHFSw3/2CX99lo+hA64NUorOeyG9FJA68VJFaLqNu0hkIlXkgelAF3VtEjvNMF1pKOctyPTFc/bw
- tGVeMfMRzW54f119M8yJ2IjlGzk9B/k1p6f4fsmi2xXsUmeP88U7gYV5Et3aQlWCsox+NR2eUnWG
- 7bdvrZ1TRY7FXjuQsatzHJ7VkyeXbxnz38xl6NmkBFfiXR3MDKQjHI9xUMV0ijMnNdBZWbeJbUcC
- SZU+U454rFu/DF7byNJcW0qxqeeOtAE0EcbI+4nax49qnKNY7CCG46Vjw3DRHO1gtaNrqPnBRKu1
- R0Y80AXYDHPAzlPmzzTWG2Evn8KafMMWIsFfamKxcAyjAHbNAFSeRJpOBg0xrXykVjyp6VLqFv5b
- AqwTI6dal02ZZ5VjuMNGentQBJZxXFtFuUZDcitDSPFrwOYrkFkfj6Vl30l7p87RpKRDn92eoIqG
- 31gRxk3qMzqRnmgC/wCJtIa2uzLYfMjgEj2rNs70woyIMjPLHtW7Y3y38gkUnGBke1R6p4dS/mNx
- obeZgfvIVH3Pf3oAz7W3EmGzgrSSRqszF13+4/hqOOLdGSrk5HO0d6WCUxYaUMYhw4HegCM6TLcy
- Ztkd0wckd6jtZZbPiI+aqnlem2tTStXNvcbYZyiSA4QcdMf41Y8Taf8A2dZieGMR7sAkc7s8H+dA
- GVJqTT3AKtjIxtrStNVy/kyLuUj1rAlhG4NtKqOc/wB+l+2SpP8AcKMn3s07gdJdeHPtLRS2zpCr
- csD171laro72bGSFWZRwzHpQdUe8hTDEMg5xU0N7Pcx7GVpIf4lzSAwlk2yAoevUDpWpa2hvYeTg
- 0mo2UM8w8lPs4HUDvRpsFz9oYW6NKB07U0BbjvptGhkgJDRMu01VLRyyIYQSgA3HstVdVMiSlZyx
- bPKiksbyS1hdWUmKQ5K0gJpt8UgAw69iKn0/UyJdrdOmKIPIvW/cyLEqj7p4zUEUIEr+blHXJBx1
- oAk1O28q6VoSFVhk1GbZQ25TzUlvcfakIucKAcAnqaWK1cyFkQlB70AJvJdNq5I4+tBcbCnCjv71
- LIVcAowVhxj0qO2t9zkXHKt0bsKAIpbPIHlKWUjk06wgaNiqIBzViF/kKKwBHA9aguI5oX3REk9j
- TQErWypGPOGc/pTLTy47gMFyob5fetB7EmcG3G6N8hSTjNWRpgsws/y7ouWB70gKd5dGSRcfKnIP
- HFXrHSYL61e4kfyVVcYA61lC7OrxurAKxbIHtUtxfC2sTDA/A49KAEazRmkEw+TqG9as+H7YSTeX
- bvu7ccYrIt7qRdobPLc59K6jw9pf2KUXcJBVjuI/z9aALF88MsJh1AiRoPl54Iqt5GmXUG3ABx1x
- 0/WneMbGfTryO8VB5d2N6qfTJHP5VBoNtFqUb/b28uU/d2d6AJLPV4dGtP8AQyokHGKgu/Fwu9wl
- PXgj0pmpaSmnOxmYEdu5rOht2knZ4FX3oAimiju3AtlAznrVWSAW7OC2HQ/d7VdNjLaMjurbSeMC
- s+4WS41BjyEB5zQBcgnk2ARnJbqKZcydmZt3fFVxB+9DRkjHfNWLh/KKGTp/6FQBGLg3C5PzFeBT
- LeT5yEzlB0p1zb7wGtzt9RTNhWVQOHPWgDc0iUajbPbTgM5GE9aydTtPKk8sKcDrk9adZX5+0FLc
- FZM/K1dPpmgReJLR2nOyZDhQT1z60AYWgXYtrvy5cFXBXA9+OtGpLceH9YIsZ3BwGI4+YHsaNR09
- 9C1ERTFTMjBgE6YyO9S+IoDqHlag5++RGPfGKALelpb+IbtA+Ldk+ZkXofxqHxFpn2Vpv7OXdGOW
- 56Vk3GpCBQB8pB429a0bHXN8kX2gKY1ILju1AGakfmFfJXLN0/z+VdZYQG503yda5xyPp/8AqqXw
- 2LKJJvsqbjIdwDL936Viarq8u9nhA8sNg88/TFAGrdeFbeWBHscSL/AM9DWRqnhObyS7KUYdfetH
- wkx1Gdnm3rECAB6Vu674psYbIRxeZuHBJHWgDzZw2nybQMluDVnT9T2PsJK56Ve1OS1vJ/OhOfXj
- pWVdWctu/mJhgTxQBeYrOS0xAxTojJHKHspCQ3GPSqaXCTuqpnf+lTQIJ5XRXwy0AaN7YxzWzT3I
- /fSHp6VnS2LI8Yt13kj5ucAU17me4hYbvkHXJ5qvJfDMYDNlevqeaAJTAVJGBuHPFSWuoMN32iNW
- UgjOelVo5vNUvg8HGKVollOIG4HNAGhb6dHewhrVy8gPK4qaFTZZRssT1GKzLWd7C5zDlS1a9rq5
- vU2uFAIznuaAK93po2GSIEjqefu1C8QZApc+uBxWnbQpeyCG1OB1cnjmi5sUuTlxgpTQFBAYCWEQ
- bjrmmsHvDypH0qYqYGPlk56DPSnWFuz3BN2MCkB0niGK10bw/ExCyMxwhVskH8K5O98SPfWixqPm
- AxkjBNEkkz2iQSzgqn3U54rPm4RkY4YEfhQBd0gPBMGnwc8fSpvElpFBIGU5Y4Ix0qjcanIkKBG5
- 7VGzPdIHvF3P9aAHpGtymc4Ira0fU5YYUG7KA5P0rAEgjOFjfHtVqzndD8ilFkGKAPTri4h1fRrW
- DVAojmjwjdwPY/XNcJK6aTfubdjhDgc9a19PnbUYLW2upsRJ8o61S8WeH1sryKJ2AeRSUb1oApTX
- TXpaQMWJGcdal8PSf6UTcj5WOKz5YW0zgTKZG44Bq4THLpSqj7LhWJdsdfSgDo9e16OGFba0ji3p
- wZCBzXOoYZp2N2u0Mecd6Zp12cIbkfIBzTbwRG53W4wp5oAbeWVmgY2ZYeuTVC4SWFAzjdGO5qws
- HmK28jaTVi1vhaR+XfRGeJhtVR69jz6dfwpgZEcrPcAp92pl2IzMxLuRwamfSJZCXtnRhnLgcFR6
- VWc7J9mNpbtikAW9w0MheQj5ea3NG1Y2sPmWhCvjuf5Vk7UadY48RseW960rDS11C3b7EMzL3oAt
- 6hpn9pZu4GzGq7djH5g2PzpPDsMV/Y3Fveg/uVZl+vNJYRy2KhXfcB972q5aRw310/2eZLbcuCWH
- X8qaA4yTeT845B4qaEqjZlVtzflV+80qY31z/Z8T3ENqMs8ZAAGcd6zoZMncEwH6H0pAdDpusLZQ
- 7Rjc3ApkFoZJHmY4iAPXpms8R7oh/Gc5HtXQaALbUtGMN6ApPHrzQA/TvEdsdOWD92rRk8gcmud8
- QXkl1cZzlfapr3QP7NujGjfKTlSKzr2Jmdgx/wBX096AIkn8ucBQQjdat/bWMLZKOOnOOKzdjL0P
- BoiXe2Cu7vQBpxC0KAyK2488Hiql3LskbaDtbpjrV+3tlubYC2TExGBVe+tJNOAF4PmHNAFO0meG
- R1bI9jU0iK23zcbsdagWYO+xOH7mrkMWYcNgkUAQwKGA4JC5pzyFmPlEADt61asYIgSJWA3dOKv6
- zosFpdxPaBGVlG445BwKAMwuWADAbqs6eI/3hl++Pu1cj8NFyrRncAdxb0psElpY37NMhljD4YKe
- poAsWmm/aIjKknlsvUnoalhtHLcbiueucA1Uu9UMs8wt4SsOfkUnkCrOmXcotj9rkV0HSLnmgDoD
- 4JSXSzPNNFJhdwCkZX9a5+K9gD+XPgDdjNTpez6ZZywwPskcZbk/KK5qZ2llPmvvYnrQATr8zE5D
- N1zxRbou7951anhZNYuUVFw7dvSp59IltXdZ1IZKAGvpLNGfLAfufaqDCSKUEkgdMkVd07VWs7oG
- XLL0x60+7ePUjyCpByMUAV3bBGxsk1ZikV4gAMkHOKpzW5SUmN849qjjnlil3KODxj0oA6KykW7t
- yJW8pk4BFdxrGhwax4TS5JWWaEBEY9QDn/CvNrPUfJmBcZDHLV0s2vsfDMwt2ZYy4z7cGgDHv9NK
- yjfD+8bgYFUNRtTps4S6HlkjIBPU/wCcVeN86xKZmJlyMc5p/ifU5L/RYVmto9wJUyZ5oAy01Dfb
- qZV2xnoKbfX6NEv2ZcHHWmPLFJYQx2ZLTL1U1EIJA+2bAJ6Y5oAIboyDb0PU1c8xLkBJLna4Hy44
- 5x06VAbZbdcyZ3elNBXeCRjnOaAG2808N5syYmJ7fx+5q7tW5QCZQso/iqsULT7rXLr6k4xVi0dX
- +9kmgBlxpbI7SxqZAoGWz0p+i3txZ3AezJAHXjrWlZ26mFyzEnPC+vStzTLO3vZ1M8Yjwp6Hr0oA
- 5/xFqyrIggQKrLlsdc96xpQZ5wySbu2DVnVYQ9/MJCSitxVOQFW4G1aAOm+H3iGPSbie1upBDBqC
- CKRugwOfwrI8VWsenazNHZtvs0fEb/3h6j171Elg02N65x6Gt200i18VwwwXcjQ3Fou2NQMiTvye
- 3WgDn4riKEhkfKf3h6+9aFlGLeyS8eT5DIMoDnv3FXZ9I0iwhJFxJLMpwY2ACg1TvvISzMs77S5w
- EUcUAW9dH9qW6y6ZKBgcgdawoNOu7iWMmNiWOMDtT4Jxb5e1bKuMEHsfWpNM1ZrG4WWFmct0BHSg
- CprWivp0u193mMeR6VHa2jmQbVH0zV3WNRkv5mkn5YnjFRJGBMjRMScdKANvR7OO1u4pS+SGGV68
- d61/GnhSHUYReQyqsZXiPI64rK0S5hRNzfePXvWr5w1KIwwucAccUAefW1q8kqiT+WK0RpdzFFuE
- bFT0bHBqxrFj/Z87LjDZ/Km2ctw7Kgk3KO3SgDPQPuHmqNynv2rRs7hrhjDIcDqD6VPeafDfWbbC
- UnUjav8AeHfn8qsaL4bl2pLcYWJT85PYdzQBq6dfjRtKX7QnmC4JQH07f1rIl0SztbsSrcoQnJQH
- qaseJ7mBVT7PIXtDwrYwQ3esOO4RrxvLZmjI+90P5UAXrm881T9lHOeAOareXPH+8BKOB19Kb9rF
- pcq0ILDPc8mp7m+S6k3fdKj7vWgB8Gtj7Oq3AZ3fCs7DmorqxQTbl+oAqJJlu4gJMKwIxT3kNq+H
- G5/7o7D1zTA7Pwpd6NBrk5vQwMv3Pl+7UnjAwwXX7tFe3l5UjBbHvXP3GnCOxhuo2IL1G+qPcFYX
- cknoT/n2pbgVZtGFxZvNbH5VOBk+vt+FZ8lrPakrcqyHGcEYzWidWS3lCxAlVPUdDWxf6pa6nLH/
- AGlH99QoI4wTwKbA45pHEirjk1asbxYZCsoDYH1rV17wyumSKVbeGG4Y6gVk/wBn7UdgCpPc0gLw
- aEwtLKMDtWhoNykVwHdd8JGCjDIrDkSW1g2zOhVhkVLo+puSVlKlccYoA6Dxf4PbSLRb21wto7DG
- W7ntj61mpKdXtxaOQvlfMCSBuJrqLfWIfEvhg2muKzQoN4CnBJHT9cVyU5hEjNbB0CHABPNAGTPa
- fZriQONjqcZ6flUtqqB1SRmMr/dJzWlDaLrEUh1Qbnx+628ZNZE1s9nfctxEccjpQBO9tLcy7Zjw
- vfNQ31q9oee3A75qe2Yyzby5OKiutRMsjKQDg4FG4EVvEyfM5xnsD1q5bbzKHBAB9KrCJN4YMd3p
- V+wt8szRZUCnYDXsWSGPz7jGI+SMVVuvErXKEWuRk9QMYqXVyLXTUyRmRcmsSC4EAO8D2pAXxbma
- IMR8w7+tVdRtkUAT9ew71as7wsF2nFGsKodDOMzHo/YU0rgULe7j098qW545Gaki1FIbwzeYyzfw
- EdvyqkyGSfaw+bvRcQLayqyEnAyaQHR6gi6/pXnBER0IGFHzN15rnmlXyTGRuQHByeQau2GrS20G
- 9OhO3H1//VWhf6RprXbXmnrMtuYsOjNk78DkfiDQBi2rpHIVQjb1otHPnBZAMAdRVUQiW6Bgyis2
- Buq29q2nXJjn/eDsycUAOLCG8yg9zkcVCzeVIZY+cenekN0LqYRSHAHA9aLMCOTy5BlTyPegCxa6
- ltkL2+ORzxjFWbTXpLSV3Y84+XFVJvLilKjgVFMpAyBxQBq6prEF7bQSzA+ZJ97jpVRGjDbUJAB+
- U+tUywlJUdE6VteHLK3kuoDqQZ0zyAcYFAG3feVo+io90u2d13R/LyR35rm77VZNSmzC5SEj5hnH
- 14/Otu+hv/FN3gTWywW4KRqQM4/OsUeFZp5miaVAc9R0oAaXWa0EUWCIjuA9PeqEMbCYM3G77oAr
- bi8Gz2YDmeLc3ygev61X1CxnnuTE8TvPb9fKXigDMuIJFlBdtzHnAPSrEF0IwDCm5hw2VNRzxTWt
- 0BeKVMnTIxj8KZ/ahtgY49uT7UAX7VH1K63oERVOTxiuu0ex0nS7L7chJkm+R1kwwyPQZrh4JJDw
- zbVbk4/OrNpefLsnyyg5UUAf/9k=
-
-END:VCARD
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/bootstrap.php b/htdocs/includes/sabre/sabre/vobject/tests/bootstrap.php
deleted file mode 100644
index 14281e2182e..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/bootstrap.php
+++ /dev/null
@@ -1,25 +0,0 @@
-addPsr4('Sabre\\VObject\\', __DIR__ . '/VObject');
-
-if (!defined('SABRE_TEMPDIR')) {
- define('SABRE_TEMPDIR', __DIR__ . '/temp/');
-}
-
-if (!file_exists(SABRE_TEMPDIR)) {
- mkdir(SABRE_TEMPDIR);
-}
diff --git a/htdocs/includes/sabre/sabre/vobject/tests/phpunit.xml b/htdocs/includes/sabre/sabre/vobject/tests/phpunit.xml
deleted file mode 100644
index 46dad6a3d22..00000000000
--- a/htdocs/includes/sabre/sabre/vobject/tests/phpunit.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
- VObject/
-
-
-
-
- ../lib/
-
- ../lib/Sabre/VObject/includes.php
-
-
-
-
diff --git a/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/ContextStackTest.php b/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/ContextStackTest.php
deleted file mode 100644
index 71dfd3f5c0b..00000000000
--- a/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/ContextStackTest.php
+++ /dev/null
@@ -1,44 +0,0 @@
-stack = $this->getMockForTrait('Sabre\\Xml\\ContextStackTrait');
-
- }
-
- function testPushAndPull() {
-
- $this->stack->contextUri = '/foo/bar';
- $this->stack->elementMap['{DAV:}foo'] = 'Bar';
- $this->stack->namespaceMap['DAV:'] = 'd';
-
- $this->stack->pushContext();
-
- $this->assertEquals('/foo/bar', $this->stack->contextUri);
- $this->assertEquals('Bar', $this->stack->elementMap['{DAV:}foo']);
- $this->assertEquals('d', $this->stack->namespaceMap['DAV:']);
-
- $this->stack->contextUri = '/gir/zim';
- $this->stack->elementMap['{DAV:}foo'] = 'newBar';
- $this->stack->namespaceMap['DAV:'] = 'dd';
-
- $this->stack->popContext();
-
- $this->assertEquals('/foo/bar', $this->stack->contextUri);
- $this->assertEquals('Bar', $this->stack->elementMap['{DAV:}foo']);
- $this->assertEquals('d', $this->stack->namespaceMap['DAV:']);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Deserializer/EnumTest.php b/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Deserializer/EnumTest.php
deleted file mode 100644
index 2eea9bb5aaf..00000000000
--- a/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Deserializer/EnumTest.php
+++ /dev/null
@@ -1,62 +0,0 @@
-elementMap['{urn:test}root'] = 'Sabre\Xml\Deserializer\enum';
-
- $xml = <<
-
-
-XML;
-
- $result = $service->parse($xml);
-
- $expected = [
- '{urn:test}foo1',
- '{urn:test}foo2',
- ];
-
-
- $this->assertEquals($expected, $result);
-
-
- }
-
- function testDeserializeDefaultNamespace() {
-
- $service = new Service();
- $service->elementMap['{urn:test}root'] = function($reader) {
- return enum($reader, 'urn:test');
- };
-
- $xml = <<
-
-
-XML;
-
- $result = $service->parse($xml);
-
- $expected = [
- 'foo1',
- 'foo2',
- ];
-
-
- $this->assertEquals($expected, $result);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Deserializer/KeyValueTest.php b/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Deserializer/KeyValueTest.php
deleted file mode 100644
index a94ff4e01a1..00000000000
--- a/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Deserializer/KeyValueTest.php
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
- hi
-
- foo
- foo & bar
-
-
-
-BLA;
-
- $reader = new Reader();
- $reader->elementMap = [
- '{http://sabredav.org/ns}struct' => function(Reader $reader) {
- return keyValue($reader, 'http://sabredav.org/ns');
- }
- ];
- $reader->xml($input);
- $output = $reader->parse();
-
- $this->assertEquals([
- 'name' => '{http://sabredav.org/ns}root',
- 'value' => [
- [
- 'name' => '{http://sabredav.org/ns}struct',
- 'value' => [
- 'elem1' => null,
- 'elem2' => 'hi',
- '{http://sabredav.org/another-ns}elem3' => [
- [
- 'name' => '{http://sabredav.org/another-ns}elem4',
- 'value' => 'foo',
- 'attributes' => [],
- ],
- [
- 'name' => '{http://sabredav.org/another-ns}elem5',
- 'value' => 'foo & bar',
- 'attributes' => [],
- ],
- ]
- ],
- 'attributes' => [],
- ]
- ],
- 'attributes' => [],
- ], $output);
- }
-
- /**
- * @expectedException \Sabre\Xml\LibXMLException
- */
- function testKeyValueLoop() {
-
- /**
- * This bug is a weird one, because it triggers an infinite loop, but
- * only if the XML document is a certain size (in bytes). Removing one
- * or two characters from the xml body here cause the infinite loop to
- * *not* get triggered, so to properly test this bug (Issue #94), don't
- * change the XML body.
- */
- $invalid_xml = '
-
-
- NONE
- ENVELOPE
- 1
- DC
-
- NONE
- ENVELOPE
- 1
- DC/FleetType>
-
- ';
- $reader = new Reader();
-
- $reader->xml($invalid_xml);
- $reader->elementMap = [
-
- '{}Package' => function($reader) {
- $recipient = [];
- // Borrowing a parser from the KeyValue class.
- $keyValue = keyValue($reader);
-
- if (isset($keyValue['{}WeightOz'])){
- $recipient['referenceId'] = $keyValue['{}WeightOz'];
- }
-
- return $recipient;
- },
- ];
-
- $reader->parse();
-
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Deserializer/RepeatingElementsTest.php b/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Deserializer/RepeatingElementsTest.php
deleted file mode 100644
index 025d997feb2..00000000000
--- a/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Deserializer/RepeatingElementsTest.php
+++ /dev/null
@@ -1,35 +0,0 @@
-elementMap['{urn:test}collection'] = function($reader) {
- return repeatingElements($reader, '{urn:test}item');
- };
-
- $xml = <<
-
- - foo
- - bar
-
-XML;
-
- $result = $service->parse($xml);
-
- $expected = [
- 'foo',
- 'bar',
- ];
-
- $this->assertEquals($expected, $result);
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Deserializer/ValueObjectTest.php b/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Deserializer/ValueObjectTest.php
deleted file mode 100644
index 2d6ce98ce4f..00000000000
--- a/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Deserializer/ValueObjectTest.php
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
- Harry
- Turtle
-
-XML;
-
- $reader = new Reader();
- $reader->xml($input);
- $reader->elementMap = [
- '{urn:foo}foo' => function(Reader $reader) {
- return valueObject($reader, 'Sabre\\Xml\\Deserializer\\TestVo', 'urn:foo');
- }
- ];
-
- $output = $reader->parse();
-
- $vo = new TestVo();
- $vo->firstName = 'Harry';
- $vo->lastName = 'Turtle';
-
- $expected = [
- 'name' => '{urn:foo}foo',
- 'value' => $vo,
- 'attributes' => []
- ];
-
- $this->assertEquals(
- $expected,
- $output
- );
-
- }
-
- function testDeserializeValueObjectIgnoredElement() {
-
- $input = <<
-
- Harry
- Turtle
- harry@example.org
-
-XML;
-
- $reader = new Reader();
- $reader->xml($input);
- $reader->elementMap = [
- '{urn:foo}foo' => function(Reader $reader) {
- return valueObject($reader, 'Sabre\\Xml\\Deserializer\\TestVo', 'urn:foo');
- }
- ];
-
- $output = $reader->parse();
-
- $vo = new TestVo();
- $vo->firstName = 'Harry';
- $vo->lastName = 'Turtle';
-
- $expected = [
- 'name' => '{urn:foo}foo',
- 'value' => $vo,
- 'attributes' => []
- ];
-
- $this->assertEquals(
- $expected,
- $output
- );
-
- }
-
- function testDeserializeValueObjectAutoArray() {
-
- $input = <<
-
- Harry
- Turtle
-
-XML;
-
- $reader = new Reader();
- $reader->xml($input);
- $reader->elementMap = [
- '{urn:foo}foo' => function(Reader $reader) {
- return valueObject($reader, 'Sabre\\Xml\\Deserializer\\TestVo', 'urn:foo');
- }
- ];
-
- $output = $reader->parse();
-
- $vo = new TestVo();
- $vo->firstName = 'Harry';
- $vo->lastName = 'Turtle';
- $vo->link = [
- 'http://example.org/',
- 'http://example.net/',
- ];
-
-
- $expected = [
- 'name' => '{urn:foo}foo',
- 'value' => $vo,
- 'attributes' => []
- ];
-
- $this->assertEquals(
- $expected,
- $output
- );
-
- }
- function testDeserializeValueObjectEmpty() {
-
- $input = <<
-
-
-BLA;
-
- $reader = new Reader();
- $reader->elementMap = [
- '{http://sabredav.org/ns}blabla' => 'Sabre\\Xml\\Element\\Cdata',
- ];
- $reader->xml($input);
-
- $output = $reader->parse();
-
- }
-
- function testSerialize() {
-
- $writer = new Writer();
- $writer->namespaceMap = [
- 'http://sabredav.org/ns' => null
- ];
- $writer->openMemory();
- $writer->startDocument('1.0');
- $writer->setIndent(true);
- $writer->write([
- '{http://sabredav.org/ns}root' => new Cdata(''),
- ]);
-
- $output = $writer->outputMemory();
-
- $expected = <<
-]]>
-
-XML;
-
- $this->assertEquals($expected, $output);
-
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Element/Eater.php b/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Element/Eater.php
deleted file mode 100644
index aaba2a01f2b..00000000000
--- a/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Element/Eater.php
+++ /dev/null
@@ -1,78 +0,0 @@
-startElement('{http://sabredav.org/ns}elem1');
- $writer->write('hiiii!');
- $writer->endElement();
-
- }
-
- /**
- * The deserialize method is called during xml parsing.
- *
- * This method is called statictly, this is because in theory this method
- * may be used as a type of constructor, or factory method.
- *
- * Often you want to return an instance of the current class, but you are
- * free to return other data as well.
- *
- * Important note 2: You are responsible for advancing the reader to the
- * next element. Not doing anything will result in a never-ending loop.
- *
- * If you just want to skip parsing for this element altogether, you can
- * just call $reader->next();
- *
- * $reader->parseSubTree() will parse the entire sub-tree, and advance to
- * the next element.
- *
- * @param Xml\Reader $reader
- * @return mixed
- */
- static function xmlDeserialize(Xml\Reader $reader) {
-
- $reader->next();
-
- $count = 1;
- while ($count) {
-
- $reader->read();
- if ($reader->nodeType === $reader::END_ELEMENT) {
- $count--;
- }
-
- }
- $reader->read();
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Element/ElementsTest.php b/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Element/ElementsTest.php
deleted file mode 100644
index f17f2094b2e..00000000000
--- a/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Element/ElementsTest.php
+++ /dev/null
@@ -1,129 +0,0 @@
-
-
-
- content
-
-
-
-
-BLA;
-
- $reader = new Reader();
- $reader->elementMap = [
- '{http://sabredav.org/ns}listThingy' => 'Sabre\\Xml\\Element\\Elements',
- ];
- $reader->xml($input);
-
- $output = $reader->parse();
-
- $this->assertEquals([
- 'name' => '{http://sabredav.org/ns}root',
- 'value' => [
- [
- 'name' => '{http://sabredav.org/ns}listThingy',
- 'value' => [
- '{http://sabredav.org/ns}elem1',
- '{http://sabredav.org/ns}elem2',
- '{http://sabredav.org/ns}elem3',
- '{http://sabredav.org/ns}elem4',
- '{http://sabredav.org/ns}elem5',
- '{http://sabredav.org/ns}elem6',
- ],
- 'attributes' => [],
- ],
- [
- 'name' => '{http://sabredav.org/ns}listThingy',
- 'value' => [],
- 'attributes' => [],
- ],
- [
- 'name' => '{http://sabredav.org/ns}otherThing',
- 'value' => [
- [
- 'name' => '{http://sabredav.org/ns}elem1',
- 'value' => null,
- 'attributes' => [],
- ],
- [
- 'name' => '{http://sabredav.org/ns}elem2',
- 'value' => null,
- 'attributes' => [],
- ],
- [
- 'name' => '{http://sabredav.org/ns}elem3',
- 'value' => null,
- 'attributes' => [],
- ],
- ],
- 'attributes' => [],
- ],
- ],
- 'attributes' => [],
- ], $output);
-
- }
-
- function testSerialize() {
-
- $value = [
- '{http://sabredav.org/ns}elem1',
- '{http://sabredav.org/ns}elem2',
- '{http://sabredav.org/ns}elem3',
- '{http://sabredav.org/ns}elem4',
- '{http://sabredav.org/ns}elem5',
- '{http://sabredav.org/ns}elem6',
- ];
-
- $writer = new Writer();
- $writer->namespaceMap = [
- 'http://sabredav.org/ns' => null
- ];
- $writer->openMemory();
- $writer->startDocument('1.0');
- $writer->setIndent(true);
- $writer->write([
- '{http://sabredav.org/ns}root' => new Elements($value),
- ]);
-
- $output = $writer->outputMemory();
-
- $expected = <<
-
-
-
-XML;
-
- $this->assertEquals($expected, $output);
-
-
- }
-
-}
diff --git a/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Element/KeyValueTest.php b/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Element/KeyValueTest.php
deleted file mode 100644
index 51c87b5203d..00000000000
--- a/htdocs/includes/sabre/sabre/xml/tests/Sabre/Xml/Element/KeyValueTest.php
+++ /dev/null
@@ -1,210 +0,0 @@
-
-
-
- hi
-
- foo
- foo & bar
-
- Hithere
-
-
-
-
-BLA;
-
- $reader = new Reader();
- $reader->elementMap = [
- '{http://sabredav.org/ns}struct' => 'Sabre\\Xml\\Element\\KeyValue',
- ];
- $reader->xml($input);
-
- $output = $reader->parse();
-
- $this->assertEquals([
- 'name' => '{http://sabredav.org/ns}root',
- 'value' => [
- [
- 'name' => '{http://sabredav.org/ns}struct',
- 'value' => [
- '{http://sabredav.org/ns}elem1' => null,
- '{http://sabredav.org/ns}elem2' => 'hi',
- '{http://sabredav.org/ns}elem3' => [
- [
- 'name' => '{http://sabredav.org/ns}elem4',
- 'value' => 'foo',
- 'attributes' => [],
- ],
- [
- 'name' => '{http://sabredav.org/ns}elem5',
- 'value' => 'foo & bar',
- 'attributes' => [],
- ],
- ],
- '{http://sabredav.org/ns}elem6' => 'Hithere',
- ],
- 'attributes' => [],
- ],
- [
- 'name' => '{http://sabredav.org/ns}struct',
- 'value' => [],
- 'attributes' => [],
- ],
- [
- 'name' => '{http://sabredav.org/ns}otherThing',
- 'value' => [
- [
- 'name' => '{http://sabredav.org/ns}elem1',
- 'value' => null,
- 'attributes' => [],
- ],
- ],
- 'attributes' => [],
- ],
- ],
- 'attributes' => [],
- ], $output);
-
- }
-
- /**
- * This test was added to find out why an element gets eaten by the
- * SabreDAV MKCOL parser.
- */
- function testElementEater() {
-
- $input = <<
-
-
-
-
';
print '