aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-04-13 18:08:15 -0700
committerfriendica <info@friendica.com>2014-04-13 18:08:15 -0700
commit73f459b68d64282b76d8e11b8cd066faf440387a (patch)
tree2c4c235f6fad166298bc0e1b890fecd45b9a901f
parente3aa7d2aaf223d0edfe9665adad59bcb0affade9 (diff)
parent153cc599a3ffe406200462f3cc7a597c34e8fcf7 (diff)
downloadvolse-hubzilla-73f459b68d64282b76d8e11b8cd066faf440387a.tar.gz
volse-hubzilla-73f459b68d64282b76d8e11b8cd066faf440387a.tar.bz2
volse-hubzilla-73f459b68d64282b76d8e11b8cd066faf440387a.zip
Merge https://github.com/friendica/red into pending_merge
-rw-r--r--doc/bbcode.html1
-rw-r--r--vendor/autoload.php2
-rw-r--r--vendor/composer/ClassLoader.php216
-rw-r--r--vendor/composer/autoload_namespaces.php1
-rw-r--r--vendor/composer/autoload_psr4.php9
-rw-r--r--vendor/composer/autoload_real.php16
-rw-r--r--vendor/composer/installed.json69
-rw-r--r--vendor/sabre/dav/.travis.yml7
-rw-r--r--vendor/sabre/dav/ChangeLog22
-rw-r--r--vendor/sabre/dav/LICENSE2
-rw-r--r--vendor/sabre/dav/build.xml7
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Backend/AbstractBackend.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Backend/BackendInterface.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Backend/NotificationSupport.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Backend/PDO.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Backend/SharingSupport.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Calendar.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/CalendarObject.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/CalendarQueryParser.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/CalendarQueryValidator.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/CalendarRootNode.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Exception/InvalidComponentType.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/ICSExportPlugin.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/ICalendar.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/ICalendarObject.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/IShareableCalendar.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/ISharedCalendar.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Collection.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/ICollection.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/INode.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/INotificationType.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Node.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Notification/Invite.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Plugin.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Principal/Collection.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Principal/IProxyRead.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Principal/IProxyWrite.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Principal/ProxyRead.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Principal/ProxyWrite.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Principal/User.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Property/AllowedSharingModes.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Property/Invite.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Property/SupportedCalendarData.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Property/SupportedCollationSet.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Schedule/IMip.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Schedule/IOutbox.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Schedule/Outbox.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/ShareableCalendar.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/SharedCalendar.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/SharingPlugin.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/UserCalendars.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CalDAV/Version.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CardDAV/AddressBook.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CardDAV/AddressBookQueryParser.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CardDAV/AddressBookRoot.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CardDAV/Backend/AbstractBackend.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CardDAV/Backend/BackendInterface.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CardDAV/Backend/PDO.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CardDAV/Card.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CardDAV/IAddressBook.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CardDAV/ICard.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CardDAV/IDirectory.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CardDAV/Plugin.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CardDAV/Property/SupportedAddressData.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CardDAV/UserAddressBooks.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CardDAV/VCFExportPlugin.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/CardDAV/Version.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/AbstractBasic.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/AbstractDigest.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/Apache.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/BackendInterface.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/File.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/PDO.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Auth/Plugin.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Browser/GuessContentType.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Browser/MapGetToPropFind.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Browser/Plugin.php4
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Client.php13
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Collection.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception/BadRequest.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception/Conflict.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception/ConflictingLock.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception/FileNotFound.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception/Forbidden.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception/InsufficientStorage.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception/InvalidResourceType.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception/Locked.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception/MethodNotAllowed.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception/NotAuthenticated.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception/NotFound.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception/NotImplemented.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception/PaymentRequired.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception/PreconditionFailed.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception/ReportNotSupported.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception/ServiceUnavailable.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Exception/UnsupportedMediaType.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/FS/Directory.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/FS/File.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/FS/Node.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/FSExt/Directory.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/FSExt/File.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/FSExt/Node.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/File.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/ICollection.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/IExtendedCollection.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/IFile.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/INode.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/IProperties.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/IQuota.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/AbstractBackend.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/BackendInterface.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/FS.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/File.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/PDO.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Locks/LockInfo.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Locks/Plugin.php9
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Mount/Plugin.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Node.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/ObjectTree.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/PartialUpdate/IFile.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/PartialUpdate/Plugin.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Property.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Property/GetLastModified.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Property/Href.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Property/HrefList.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Property/IHref.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Property/LockDiscovery.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Property/ResourceType.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Property/Response.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Property/ResponseList.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Property/SupportedLock.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Property/SupportedReportSet.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/PropertyInterface.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Server.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/ServerPlugin.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/SimpleCollection.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/SimpleFile.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/StringUtil.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/TemporaryFileFilterPlugin.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Tree.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Tree/Filesystem.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/URLUtil.php9
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/UUIDUtil.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/Version.php4
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAV/XMLUtil.php8
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/AbstractPrincipalCollection.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/Exception/AceConflict.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NeedPrivileges.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NoAbstract.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/IACL.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/IPrincipal.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/IPrincipalCollection.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/Plugin.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/Principal.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalBackend/AbstractBackend.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalBackend/PDO.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalCollection.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/Property/Acl.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/Property/AclRestrictions.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/Property/Principal.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/DAVACL/Version.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/HTTP/AWSAuth.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/HTTP/AbstractAuth.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/HTTP/BasicAuth.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/HTTP/DigestAuth.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/HTTP/Request.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/HTTP/Response.php4
-rw-r--r--vendor/sabre/dav/lib/Sabre/HTTP/Util.php2
-rw-r--r--vendor/sabre/dav/lib/Sabre/HTTP/Version.php4
-rw-r--r--vendor/sabre/dav/lib/Sabre/autoload.php2
-rw-r--r--vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php4
-rw-r--r--vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php5
-rw-r--r--vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php4
-rw-r--r--vendor/sabre/dav/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php5
-rw-r--r--vendor/sabre/dav/tests/Sabre/CalDAV/Issue203Test.php4
-rw-r--r--vendor/sabre/dav/tests/Sabre/CalDAV/Issue205Test.php5
-rw-r--r--vendor/sabre/dav/tests/Sabre/CalDAV/Issue211Test.php5
-rw-r--r--vendor/sabre/dav/tests/Sabre/CalDAV/Issue220Test.php5
-rw-r--r--vendor/sabre/dav/tests/Sabre/CalDAV/Issue228Test.php4
-rw-r--r--vendor/sabre/dav/tests/Sabre/CalDAV/Schedule/IMip/Mock.php6
-rw-r--r--vendor/sabre/dav/tests/Sabre/DAV/URLUtilTest.php4
-rw-r--r--vendor/sabre/dav/tests/Sabre/DAVServerTest.php5
-rw-r--r--vendor/sabre/vobject/.travis.yml8
-rw-r--r--vendor/sabre/vobject/ChangeLog4
-rw-r--r--vendor/sabre/vobject/lib/Sabre/VObject/TimeZoneUtil.php59
-rw-r--r--vendor/sabre/vobject/lib/Sabre/VObject/Version.php2
-rw-r--r--vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorTest.php4
-rw-r--r--vendor/sabre/vobject/tests/Sabre/VObject/TimeZoneUtilTest.php13
200 files changed, 588 insertions, 291 deletions
diff --git a/doc/bbcode.html b/doc/bbcode.html
index cb8286ad7..1bcb9039c 100644
--- a/doc/bbcode.html
+++ b/doc/bbcode.html
@@ -61,6 +61,7 @@
<li>[observer.address] address (zot-id) of observer <br />
<li>[observer.photo] profile photo of observer <br />
<br />
+<li>[spoiler] for hiding spoilers<br /><br />
<li>[rpost=title]Text to post[/rpost] The observer will be returned to their home hub to enter a post with the specified title and body. Both are optional <br />
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 5944e90ba..4ab3c99bc 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
require_once __DIR__ . '/composer' . '/autoload_real.php';
-return ComposerAutoloaderInit4d84580b3010f36341ea4e8d04bc8eab::getLoader();
+return ComposerAutoloaderInitd0f40897631bfac5572c9d06d82344bf::getLoader();
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
index 1db8d9a0b..a71055531 100644
--- a/vendor/composer/ClassLoader.php
+++ b/vendor/composer/ClassLoader.php
@@ -42,19 +42,36 @@ namespace Composer\Autoload;
*/
class ClassLoader
{
- private $prefixes = array();
- private $fallbackDirs = array();
+ // PSR-4
+ private $prefixLengthsPsr4 = array();
+ private $prefixDirsPsr4 = array();
+ private $fallbackDirsPsr4 = array();
+
+ // PSR-0
+ private $prefixesPsr0 = array();
+ private $fallbackDirsPsr0 = array();
+
private $useIncludePath = false;
private $classMap = array();
public function getPrefixes()
{
- return call_user_func_array('array_merge', $this->prefixes);
+ return call_user_func_array('array_merge', $this->prefixesPsr0);
+ }
+
+ public function getPrefixesPsr4()
+ {
+ return $this->prefixDirsPsr4;
}
public function getFallbackDirs()
{
- return $this->fallbackDirs;
+ return $this->fallbackDirsPsr0;
+ }
+
+ public function getFallbackDirsPsr4()
+ {
+ return $this->fallbackDirsPsr4;
}
public function getClassMap()
@@ -75,23 +92,24 @@ class ClassLoader
}
/**
- * Registers a set of classes, merging with any others previously set.
+ * Registers a set of PSR-0 directories for a given prefix, either
+ * appending or prepending to the ones previously set for this prefix.
*
- * @param string $prefix The classes prefix
- * @param array|string $paths The location(s) of the classes
- * @param bool $prepend Prepend the location(s)
+ * @param string $prefix The prefix
+ * @param array|string $paths The PSR-0 root directories
+ * @param bool $prepend Whether to prepend the directories
*/
public function add($prefix, $paths, $prepend = false)
{
if (!$prefix) {
if ($prepend) {
- $this->fallbackDirs = array_merge(
+ $this->fallbackDirsPsr0 = array_merge(
(array) $paths,
- $this->fallbackDirs
+ $this->fallbackDirsPsr0
);
} else {
- $this->fallbackDirs = array_merge(
- $this->fallbackDirs,
+ $this->fallbackDirsPsr0 = array_merge(
+ $this->fallbackDirsPsr0,
(array) $paths
);
}
@@ -100,38 +118,104 @@ class ClassLoader
}
$first = $prefix[0];
- if (!isset($this->prefixes[$first][$prefix])) {
- $this->prefixes[$first][$prefix] = (array) $paths;
+ if (!isset($this->prefixesPsr0[$first][$prefix])) {
+ $this->prefixesPsr0[$first][$prefix] = (array) $paths;
return;
}
if ($prepend) {
- $this->prefixes[$first][$prefix] = array_merge(
+ $this->prefixesPsr0[$first][$prefix] = array_merge(
+ (array) $paths,
+ $this->prefixesPsr0[$first][$prefix]
+ );
+ } else {
+ $this->prefixesPsr0[$first][$prefix] = array_merge(
+ $this->prefixesPsr0[$first][$prefix],
+ (array) $paths
+ );
+ }
+ }
+
+ /**
+ * Registers a set of PSR-4 directories for a given namespace, either
+ * appending or prepending to the ones previously set for this namespace.
+ *
+ * @param string $prefix The prefix/namespace, with trailing '\\'
+ * @param array|string $paths The PSR-0 base directories
+ * @param bool $prepend Whether to prepend the directories
+ */
+ public function addPsr4($prefix, $paths, $prepend = false)
+ {
+ if (!$prefix) {
+ // Register directories for the root namespace.
+ if ($prepend) {
+ $this->fallbackDirsPsr4 = array_merge(
+ (array) $paths,
+ $this->fallbackDirsPsr4
+ );
+ } else {
+ $this->fallbackDirsPsr4 = array_merge(
+ $this->fallbackDirsPsr4,
+ (array) $paths
+ );
+ }
+ } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+ // Register directories for a new namespace.
+ $length = strlen($prefix);
+ if ('\\' !== $prefix[$length - 1]) {
+ throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+ }
+ $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+ $this->prefixDirsPsr4[$prefix] = (array) $paths;
+ } elseif ($prepend) {
+ // Prepend directories for an already registered namespace.
+ $this->prefixDirsPsr4[$prefix] = array_merge(
(array) $paths,
- $this->prefixes[$first][$prefix]
+ $this->prefixDirsPsr4[$prefix]
);
} else {
- $this->prefixes[$first][$prefix] = array_merge(
- $this->prefixes[$first][$prefix],
+ // Append directories for an already registered namespace.
+ $this->prefixDirsPsr4[$prefix] = array_merge(
+ $this->prefixDirsPsr4[$prefix],
(array) $paths
);
}
}
/**
- * Registers a set of classes, replacing any others previously set.
+ * Registers a set of PSR-0 directories for a given prefix,
+ * replacing any others previously set for this prefix.
*
- * @param string $prefix The classes prefix
- * @param array|string $paths The location(s) of the classes
+ * @param string $prefix The prefix
+ * @param array|string $paths The PSR-0 base directories
*/
public function set($prefix, $paths)
{
if (!$prefix) {
- $this->fallbackDirs = (array) $paths;
+ $this->fallbackDirsPsr0 = (array) $paths;
+ } else {
+ $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+ }
+ }
- return;
+ /**
+ * Registers a set of PSR-4 directories for a given namespace,
+ * replacing any others previously set for this namespace.
+ *
+ * @param string $prefix The prefix/namespace, with trailing '\\'
+ * @param array|string $paths The PSR-4 base directories
+ */
+ public function setPsr4($prefix, $paths) {
+ if (!$prefix) {
+ $this->fallbackDirsPsr4 = (array) $paths;
+ } else {
+ $length = strlen($prefix);
+ if ('\\' !== $prefix[$length - 1]) {
+ throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+ }
+ $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+ $this->prefixDirsPsr4[$prefix] = (array) $paths;
}
- $this->prefixes[substr($prefix, 0, 1)][$prefix] = (array) $paths;
}
/**
@@ -182,7 +266,7 @@ class ClassLoader
public function loadClass($class)
{
if ($file = $this->findFile($class)) {
- include $file;
+ includeFile($file);
return true;
}
@@ -202,45 +286,93 @@ class ClassLoader
$class = substr($class, 1);
}
+ // class map lookup
if (isset($this->classMap[$class])) {
return $this->classMap[$class];
}
+ $file = $this->findFileWithExtension($class, '.php');
+
+ // Search for Hack files if we are running on HHVM
+ if ($file === null && defined('HHVM_VERSION')) {
+ $file = $this->findFileWithExtension($class, '.hh');
+ }
+
+ if ($file === null) {
+ // Remember that this class does not exist.
+ return $this->classMap[$class] = false;
+ }
+
+ return $file;
+ }
+
+ private function findFileWithExtension($class, $ext)
+ {
+ // PSR-4 lookup
+ $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+ $first = $class[0];
+ if (isset($this->prefixLengthsPsr4[$first])) {
+ foreach ($this->prefixLengthsPsr4[$first] as $prefix => $length) {
+ if (0 === strpos($class, $prefix)) {
+ foreach ($this->prefixDirsPsr4[$prefix] as $dir) {
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+ return $file;
+ }
+ }
+ }
+ }
+ }
+
+ // PSR-4 fallback dirs
+ foreach ($this->fallbackDirsPsr4 as $dir) {
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+ return $file;
+ }
+ }
+
+ // PSR-0 lookup
if (false !== $pos = strrpos($class, '\\')) {
// namespaced class name
- $classPath = strtr(substr($class, 0, $pos), '\\', DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
- $className = substr($class, $pos + 1);
+ $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+ . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
} else {
// PEAR-like class name
- $classPath = null;
- $className = $class;
+ $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
}
- $classPath .= strtr($className, '_', DIRECTORY_SEPARATOR) . '.php';
-
- $first = $class[0];
- if (isset($this->prefixes[$first])) {
- foreach ($this->prefixes[$first] as $prefix => $dirs) {
+ if (isset($this->prefixesPsr0[$first])) {
+ foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
if (0 === strpos($class, $prefix)) {
foreach ($dirs as $dir) {
- if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) {
- return $dir . DIRECTORY_SEPARATOR . $classPath;
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+ return $file;
}
}
}
}
}
- foreach ($this->fallbackDirs as $dir) {
- if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) {
- return $dir . DIRECTORY_SEPARATOR . $classPath;
+ // PSR-0 fallback dirs
+ foreach ($this->fallbackDirsPsr0 as $dir) {
+ if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+ return $file;
}
}
- if ($this->useIncludePath && $file = stream_resolve_include_path($classPath)) {
+ // PSR-0 include paths.
+ if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
return $file;
}
-
- return $this->classMap[$class] = false;
}
}
+
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ */
+function includeFile($file)
+{
+ include $file;
+}
diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
index e64e0a875..a3c1e111b 100644
--- a/vendor/composer/autoload_namespaces.php
+++ b/vendor/composer/autoload_namespaces.php
@@ -12,4 +12,5 @@ return array(
'Sabre\\DAV' => array($vendorDir . '/sabre/dav/lib'),
'Sabre\\CardDAV' => array($vendorDir . '/sabre/dav/lib'),
'Sabre\\CalDAV' => array($vendorDir . '/sabre/dav/lib'),
+ 'Monolog' => array($vendorDir . '/monolog/monolog/src'),
);
diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
new file mode 100644
index 000000000..b265c64a2
--- /dev/null
+++ b/vendor/composer/autoload_psr4.php
@@ -0,0 +1,9 @@
+<?php
+
+// autoload_psr4.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+);
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index 9faa11fc8..33803553e 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
// autoload_real.php @generated by Composer
-class ComposerAutoloaderInit4d84580b3010f36341ea4e8d04bc8eab
+class ComposerAutoloaderInitd0f40897631bfac5572c9d06d82344bf
{
private static $loader;
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit4d84580b3010f36341ea4e8d04bc8eab
return self::$loader;
}
- spl_autoload_register(array('ComposerAutoloaderInit4d84580b3010f36341ea4e8d04bc8eab', 'loadClassLoader'), true, true);
+ spl_autoload_register(array('ComposerAutoloaderInitd0f40897631bfac5572c9d06d82344bf', 'loadClassLoader'), true, true);
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
- spl_autoload_unregister(array('ComposerAutoloaderInit4d84580b3010f36341ea4e8d04bc8eab', 'loadClassLoader'));
+ spl_autoload_unregister(array('ComposerAutoloaderInitd0f40897631bfac5572c9d06d82344bf', 'loadClassLoader'));
$vendorDir = dirname(__DIR__);
$baseDir = dirname($vendorDir);
@@ -31,6 +31,11 @@ class ComposerAutoloaderInit4d84580b3010f36341ea4e8d04bc8eab
$loader->set($namespace, $path);
}
+ $map = require __DIR__ . '/autoload_psr4.php';
+ foreach ($map as $namespace => $path) {
+ $loader->setPsr4($namespace, $path);
+ }
+
$classMap = require __DIR__ . '/autoload_classmap.php';
if ($classMap) {
$loader->addClassMap($classMap);
@@ -41,3 +46,8 @@ class ComposerAutoloaderInit4d84580b3010f36341ea4e8d04bc8eab
return $loader;
}
}
+
+function composerRequired0f40897631bfac5572c9d06d82344bf($file)
+{
+ require $file;
+}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 81bd0fd3a..bd9d342fb 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1,24 +1,69 @@
[
{
+ "name": "monolog/monolog",
+ "version": "1.0.2",
+ "version_normalized": "1.0.2.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Seldaek/monolog.git",
+ "reference": "b704c49a3051536f67f2d39f13568f74615b9922"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Seldaek/monolog/zipball/b704c49a3051536f67f2d39f13568f74615b9922",
+ "reference": "b704c49a3051536f67f2d39f13568f74615b9922",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.3.0"
+ },
+ "time": "2011-10-24 09:39:02",
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "psr-0": {
+ "Monolog": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Jordi Boggiano",
+ "email": "j.boggiano@seld.be",
+ "homepage": "http://seld.be",
+ "role": "Developer"
+ }
+ ],
+ "description": "Logging for PHP 5.3",
+ "homepage": "http://github.com/Seldaek/monolog",
+ "keywords": [
+ "log",
+ "logging"
+ ]
+ },
+ {
"name": "sabre/vobject",
- "version": "2.1.3",
- "version_normalized": "2.1.3.0",
+ "version": "2.1.4",
+ "version_normalized": "2.1.4.0",
"source": {
"type": "git",
"url": "https://github.com/fruux/sabre-vobject.git",
- "reference": "e46d6855cfef23318e7c422cd08d36e344624675"
+ "reference": "199b6ec87104b05e3013dfd5b90eafbbe4cf97dc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fruux/sabre-vobject/zipball/e46d6855cfef23318e7c422cd08d36e344624675",
- "reference": "e46d6855cfef23318e7c422cd08d36e344624675",
+ "url": "https://api.github.com/repos/fruux/sabre-vobject/zipball/199b6ec87104b05e3013dfd5b90eafbbe4cf97dc",
+ "reference": "199b6ec87104b05e3013dfd5b90eafbbe4cf97dc",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
"php": ">=5.3.1"
},
- "time": "2013-10-02 15:57:01",
+ "time": "2014-03-30 23:01:06",
"bin": [
"bin/vobjectvalidate.php"
],
@@ -51,17 +96,17 @@
},
{
"name": "sabre/dav",
- "version": "1.8.7",
- "version_normalized": "1.8.7.0",
+ "version": "1.8.9",
+ "version_normalized": "1.8.9.0",
"source": {
"type": "git",
"url": "https://github.com/fruux/sabre-dav.git",
- "reference": "41c750da3c60a427cdd847df090ef0fc7e8f1076"
+ "reference": "25e095469e44d195cd255bdce55ce473224558bc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/fruux/sabre-dav/zipball/41c750da3c60a427cdd847df090ef0fc7e8f1076",
- "reference": "41c750da3c60a427cdd847df090ef0fc7e8f1076",
+ "url": "https://api.github.com/repos/fruux/sabre-dav/zipball/25e095469e44d195cd255bdce55ce473224558bc",
+ "reference": "25e095469e44d195cd255bdce55ce473224558bc",
"shasum": ""
},
"require": {
@@ -90,7 +135,7 @@
"ext-curl": "*",
"ext-pdo": "*"
},
- "time": "2013-10-02 18:38:26",
+ "time": "2014-02-26 22:17:11",
"bin": [
"bin/sabredav"
],
diff --git a/vendor/sabre/dav/.travis.yml b/vendor/sabre/dav/.travis.yml
index 37c99f841..baffa5b97 100644
--- a/vendor/sabre/dav/.travis.yml
+++ b/vendor/sabre/dav/.travis.yml
@@ -4,6 +4,13 @@ php:
- 5.3
- 5.4
- 5.5
+ - 5.6
+ - hhvm
+
+matrix:
+ allow_failures:
+ - php: 5.6
+ - php: hhvm
services:
- mysql
diff --git a/vendor/sabre/dav/ChangeLog b/vendor/sabre/dav/ChangeLog
index 145cf1fcb..e41a6c88a 100644
--- a/vendor/sabre/dav/ChangeLog
+++ b/vendor/sabre/dav/ChangeLog
@@ -1,6 +1,14 @@
-1.8.7-stable (2013-10-02)
+1.8.9-stable (2014-02-26)
+ * The zip release ships with sabre/vobject 2.1.3.
+ * includes changes from version 1.7.11.
+
+1.8.8-stable (2014-02-09)
* The zip release ships with sabre/vobject 2.1.3.
- * Includes changes from version 1.7.9.
+ * includes changes from version 1.7.10.
+
+1.8.7-stable (2013-10-02)
+ * the zip release ships with sabre/vobject 2.1.3.
+ * includes changes from version 1.7.9.
1.8.6-stable (2013-06-18)
* The zip release ships with sabre/vobject 2.1.0.
@@ -49,6 +57,16 @@
* Added: The Proxy principal classes now both implement an interface, for
greater flexiblity.
+1.7.11-stable (2014-02-26)
+ * The zip release ships with sabre/vobject 2.1.3.
+ * Fixed: Issue #407: large downloads failed.
+ * Fixed: Issue #414: XXE security problem on older PHP versions.
+
+1.7.10-stable (2014-02-09)
+ * The zip release ships with sabre/vobject 2.1.3.
+ * Fixed: Potential security vulnerability in the http client.
+ * Fixed: Issue #374: Don't urlescape colon (:) when it's not required.
+
1.7.9-stable (2013-10-02)
* The zip release ships with sabre/vobject 2.1.3.
* Fixed: Issue #365. Incorrect output when principal urls have spaces in
diff --git a/vendor/sabre/dav/LICENSE b/vendor/sabre/dav/LICENSE
index 68aceab80..7435c19fd 100644
--- a/vendor/sabre/dav/LICENSE
+++ b/vendor/sabre/dav/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/)
+Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
All rights reserved.
diff --git a/vendor/sabre/dav/build.xml b/vendor/sabre/dav/build.xml
index 6a37d2011..0f70f8199 100644
--- a/vendor/sabre/dav/build.xml
+++ b/vendor/sabre/dav/build.xml
@@ -14,13 +14,6 @@
<zip destfile="build/SabreDAV-${sabredav.version}.zip" basedir="build/SabreDAV" prefix="SabreDAV/" />
</target>
- <target name="uploadzip" depends="buildzip">
- <echo>Uploading to Google Code</echo>
- <propertyprompt propertyName="googlecode.username" promptText="Enter your googlecode username" useExistingValue="true" />
- <propertyprompt propertyName="googlecode.password" promptText="Enter your googlecode password" useExistingValue="true" />
- <exec command="bin/googlecode_upload.py -s 'SabreDAV ${sabredav.version}' -p sabredav --labels=${sabredav.ucstability} -u '${googlecode.username}' -w '${googlecode.password}' build/SabreDAV-${sabredav.version}.zip" checkreturn="true" />
- </target>
-
<target name="clean" depends="init">
<echo msg="Removing build files (cleaning up distribution)" />
<delete dir="docs/api" />
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/AbstractBackend.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/AbstractBackend.php
index 21f88162b..4e46c2e19 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/AbstractBackend.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/AbstractBackend.php
@@ -10,7 +10,7 @@ use Sabre\CalDAV;
*
* Checkout the BackendInterface for all the methods that must be implemented.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/BackendInterface.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/BackendInterface.php
index b8334e5d0..62ce4a36a 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/BackendInterface.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/BackendInterface.php
@@ -5,7 +5,7 @@ namespace Sabre\CalDAV\Backend;
/**
* Every CalDAV backend must at least implement this interface.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/NotificationSupport.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/NotificationSupport.php
index 50021a3e7..f151fcc81 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/NotificationSupport.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/NotificationSupport.php
@@ -16,7 +16,7 @@ namespace Sabre\CalDAV\Backend;
*
* The primary usecase is to allow for calendar-sharing.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/PDO.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/PDO.php
index 99130ceb1..1405788ba 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/PDO.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/PDO.php
@@ -12,7 +12,7 @@ use Sabre\DAV;
* This backend is used to store calendar-data in a PDO database, such as
* sqlite or MySQL
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/SharingSupport.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/SharingSupport.php
index 8fb2b320c..a2d23820b 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/SharingSupport.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Backend/SharingSupport.php
@@ -165,7 +165,7 @@ namespace Sabre\CalDAV\Backend;
* the backend, the SharingPlugin automatically injects it and assumes both
* features are available.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Calendar.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Calendar.php
index 63bd2b07a..6d2ae7388 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Calendar.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Calendar.php
@@ -11,7 +11,7 @@ use Sabre\DAVACL;
* A calendar can contain multiple TODO and or Events. These are represented
* as \Sabre\CalDAV\CalendarObject objects.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/CalendarObject.php b/vendor/sabre/dav/lib/Sabre/CalDAV/CalendarObject.php
index 1fbb51b79..82776c305 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/CalendarObject.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/CalendarObject.php
@@ -5,7 +5,7 @@ namespace Sabre\CalDAV;
/**
* The CalendarObject represents a single VEVENT or VTODO within a Calendar.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/CalendarQueryParser.php b/vendor/sabre/dav/lib/Sabre/CalDAV/CalendarQueryParser.php
index c894a066e..ba3ea172b 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/CalendarQueryParser.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/CalendarQueryParser.php
@@ -10,7 +10,7 @@ use Sabre\VObject;
* Whoever designed this format, and the CalDAV equivalent even more so,
* has no feel for design.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/CalendarQueryValidator.php b/vendor/sabre/dav/lib/Sabre/CalDAV/CalendarQueryValidator.php
index fd47127f2..b440ce8f4 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/CalendarQueryValidator.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/CalendarQueryValidator.php
@@ -14,7 +14,7 @@ use DateTime;
* This is used to determine which icalendar objects should be returned for a
* calendar-query REPORT request.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/CalendarRootNode.php b/vendor/sabre/dav/lib/Sabre/CalDAV/CalendarRootNode.php
index 5d1ee7780..9883d9f69 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/CalendarRootNode.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/CalendarRootNode.php
@@ -10,7 +10,7 @@ use Sabre\DAVACL\PrincipalBackend;
* This object is responsible for generating a list of calendar-homes for each
* user.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Exception/InvalidComponentType.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Exception/InvalidComponentType.php
index b8d36794c..4d9ab3afc 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Exception/InvalidComponentType.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Exception/InvalidComponentType.php
@@ -8,7 +8,7 @@ use Sabre\CalDAV;
/**
* InvalidComponentType
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/ICSExportPlugin.php b/vendor/sabre/dav/lib/Sabre/CalDAV/ICSExportPlugin.php
index aa0637295..a2153b5af 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/ICSExportPlugin.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/ICSExportPlugin.php
@@ -12,7 +12,7 @@ use Sabre\VObject;
* This is useful for clients that don't support CalDAV yet. They often do
* support ics files.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/ICalendar.php b/vendor/sabre/dav/lib/Sabre/CalDAV/ICalendar.php
index 8be36d35a..564924333 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/ICalendar.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/ICalendar.php
@@ -8,7 +8,7 @@ use Sabre\DAV;
*
* Implement this interface to allow a node to be recognized as an calendar.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/ICalendarObject.php b/vendor/sabre/dav/lib/Sabre/CalDAV/ICalendarObject.php
index 365d4009c..b87028e78 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/ICalendarObject.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/ICalendarObject.php
@@ -11,7 +11,7 @@ use Sabre\DAV;
*
* Calendar objects are resources such as Events, Todo's or Journals.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/IShareableCalendar.php b/vendor/sabre/dav/lib/Sabre/CalDAV/IShareableCalendar.php
index b418eab52..15ae14c01 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/IShareableCalendar.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/IShareableCalendar.php
@@ -5,7 +5,7 @@ namespace Sabre\CalDAV;
/**
* This interface represents a Calendar that can be shared with other users.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/ISharedCalendar.php b/vendor/sabre/dav/lib/Sabre/CalDAV/ISharedCalendar.php
index f9084a4f4..0c388ad18 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/ISharedCalendar.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/ISharedCalendar.php
@@ -5,7 +5,7 @@ namespace Sabre\CalDAV;
/**
* This interface represents a Calendar that is shared by a different user.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Collection.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Collection.php
index e86f81b59..7f87fb365 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Collection.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Collection.php
@@ -16,7 +16,7 @@ use Sabre\DAVACL;
* This collection should only return Sabre\CalDAV\Notifications\INode nodes as
* its children.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/ICollection.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/ICollection.php
index 57a2f7dfb..2e810a621 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/ICollection.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/ICollection.php
@@ -14,7 +14,7 @@ use Sabre\DAV;
* This collection should only return Sabre\CalDAV\Notifications\INode nodes as
* its children.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/INode.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/INode.php
index 854e891dd..6f5fdc56f 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/INode.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/INode.php
@@ -12,7 +12,7 @@ namespace Sabre\CalDAV\Notifications;
* For a complete example, check out the Notification class, which contains
* some helper functions.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/INotificationType.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/INotificationType.php
index cf64eb682..b64d5aaef 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/INotificationType.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/INotificationType.php
@@ -6,7 +6,7 @@ use Sabre\DAV;
/**
* This interface reflects a single notification type.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Node.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Node.php
index ef0aa0c26..d6f301093 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Node.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Node.php
@@ -13,7 +13,7 @@ use Sabre\DAVACL;
* MUST return an xml document that matches the requirements of the
* 'caldav-notifications.txt' spec.
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Notification/Invite.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Notification/Invite.php
index 42daf3fb0..f2d6eabc7 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Notification/Invite.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Notification/Invite.php
@@ -9,7 +9,7 @@ use Sabre\CalDAV;
/**
* This class represents the cs:invite-notification notification element.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php
index 3654a3e16..c91366b98 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php
@@ -9,7 +9,7 @@ use Sabre\CalDAV;
/**
* This class represents the cs:invite-reply notification element.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php
index a6a1c4928..c3a1d740b 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php
@@ -11,7 +11,7 @@ use Sabre\CalDAV;
* This notification can be used to indicate to the user that the system is
* down.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Plugin.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Plugin.php
index 084036cf9..53b6f6d71 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Plugin.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Plugin.php
@@ -12,7 +12,7 @@ use Sabre\VObject;
* This plugin provides functionality added by CalDAV (RFC 4791)
* It implements new reports, and the MKCALENDAR method.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/Collection.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/Collection.php
index 4fc70e265..1b2c1d407 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/Collection.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/Collection.php
@@ -11,7 +11,7 @@ use Sabre\DAVACL;
* calendar-proxy-write sub-principals, as defined by the caldav-proxy
* specification.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/IProxyRead.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/IProxyRead.php
index a774b2aad..8a3fd1cd5 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/IProxyRead.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/IProxyRead.php
@@ -10,7 +10,7 @@ use Sabre\DAVACL;
* Any principal node implementing this interface will be picked up as a 'proxy
* principal group'.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/IProxyWrite.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/IProxyWrite.php
index 48c84d25d..513e2b360 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/IProxyWrite.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/IProxyWrite.php
@@ -10,7 +10,7 @@ use Sabre\DAVACL;
* Any principal node implementing this interface will be picked up as a 'proxy
* principal group'.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/ProxyRead.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/ProxyRead.php
index 0a8bf57b0..25f494af7 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/ProxyRead.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/ProxyRead.php
@@ -11,7 +11,7 @@ use Sabre\DAV;
* This is needed to implement 'Calendar delegation' support. This class is
* instantiated by User.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/ProxyWrite.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/ProxyWrite.php
index c9b136fe0..3e5f0c41d 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/ProxyWrite.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/ProxyWrite.php
@@ -11,7 +11,7 @@ use Sabre\DAV;
* This is needed to implement 'Calendar delegation' support. This class is
* instantiated by User.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/User.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/User.php
index d37ca115d..2d3a95e53 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/User.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Principal/User.php
@@ -11,7 +11,7 @@ use Sabre\DAVACL;
* collection and returns the caldav-proxy-read and caldav-proxy-write child
* principals.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Property/AllowedSharingModes.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Property/AllowedSharingModes.php
index 5284baf3a..eb0417ee2 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Property/AllowedSharingModes.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Property/AllowedSharingModes.php
@@ -16,7 +16,7 @@ use Sabre\DAV;
* such as VEVENT, VTODO
*
* @see https://trac.calendarserver.org/browser/CalendarServer/trunk/doc/Extensions/caldav-sharing-02.txt
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Property/Invite.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Property/Invite.php
index e955e5f1c..dceae7574 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Property/Invite.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Property/Invite.php
@@ -14,7 +14,7 @@ use Sabre\CalDAV;
* namespace.
*
* @see https://trac.calendarserver.org/browser/CalendarServer/trunk/doc/Extensions/caldav-sharing-02.txt
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php
index 967c5e22a..4d3667e95 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php
@@ -15,7 +15,7 @@ use Sabre\CalDAV;
* means that this calendar will not be taken into consideration when a
* different user queries for free-busy information. If it's 'opaque', it will.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
index 84c66c913..6a35f938a 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php
@@ -12,7 +12,7 @@ use Sabre\CalDAV;
* property in the CalDAV namespace. It simply requires an array of components,
* such as VEVENT, VTODO
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Property/SupportedCalendarData.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Property/SupportedCalendarData.php
index ab989e831..22b2cc124 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Property/SupportedCalendarData.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Property/SupportedCalendarData.php
@@ -11,7 +11,7 @@ use Sabre\CalDAV\Plugin;
* in the CalDAV namespace. SabreDAV only has support for text/calendar;2.0
* so the value is currently hardcoded.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Property/SupportedCollationSet.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Property/SupportedCollationSet.php
index cefc3d3bd..48f3aca88 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Property/SupportedCollationSet.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Property/SupportedCollationSet.php
@@ -9,7 +9,7 @@ use Sabre\DAV;
* This property is a representation of the supported-collation-set property
* in the CalDAV namespace.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Schedule/IMip.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Schedule/IMip.php
index 2a6c5f360..4c0ea1c96 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Schedule/IMip.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Schedule/IMip.php
@@ -15,7 +15,7 @@ use Sabre\DAV;
* If you want to customize the email that gets sent out, you can do so by
* extending this class and overriding the sendMessage method.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Schedule/IOutbox.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Schedule/IOutbox.php
index 55a70bd34..5c7b2705e 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Schedule/IOutbox.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Schedule/IOutbox.php
@@ -6,7 +6,7 @@ namespace Sabre\CalDAV\Schedule;
* Implement this interface to have a node be recognized as a CalDAV scheduling
* outbox.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Schedule/Outbox.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Schedule/Outbox.php
index d05889f35..f401ba7ef 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Schedule/Outbox.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Schedule/Outbox.php
@@ -12,7 +12,7 @@ use Sabre\DAVACL;
* free-busy requests. This functionality is completely handled by the
* Scheduling plugin, so this object is actually mostly static.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/ShareableCalendar.php b/vendor/sabre/dav/lib/Sabre/CalDAV/ShareableCalendar.php
index 47e098847..25790a853 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/ShareableCalendar.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/ShareableCalendar.php
@@ -6,7 +6,7 @@ namespace Sabre\CalDAV;
* This object represents a CalDAV calendar that can be shared with other
* users.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/SharedCalendar.php b/vendor/sabre/dav/lib/Sabre/CalDAV/SharedCalendar.php
index 7641289dd..d880c06ca 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/SharedCalendar.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/SharedCalendar.php
@@ -7,7 +7,7 @@ use Sabre\DAVACL;
/**
* This object represents a CalDAV calendar that is shared by a different user.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/SharingPlugin.php b/vendor/sabre/dav/lib/Sabre/CalDAV/SharingPlugin.php
index c37571706..b8270c3f7 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/SharingPlugin.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/SharingPlugin.php
@@ -16,7 +16,7 @@ use Sabre\DAV;
* Note: This feature is experimental, and may change in between different
* SabreDAV versions.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/UserCalendars.php b/vendor/sabre/dav/lib/Sabre/CalDAV/UserCalendars.php
index a3be4fdd3..67de13105 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/UserCalendars.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/UserCalendars.php
@@ -8,7 +8,7 @@ use Sabre\DAVACL;
/**
* The UserCalenders class contains all calendars associated to one user
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CalDAV/Version.php b/vendor/sabre/dav/lib/Sabre/CalDAV/Version.php
index 5f305820a..78cf017f9 100644
--- a/vendor/sabre/dav/lib/Sabre/CalDAV/Version.php
+++ b/vendor/sabre/dav/lib/Sabre/CalDAV/Version.php
@@ -5,7 +5,7 @@ namespace Sabre\CalDAV;
/**
* This class contains the Sabre\CalDAV version constants.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CardDAV/AddressBook.php b/vendor/sabre/dav/lib/Sabre/CardDAV/AddressBook.php
index 85b301cb8..ec95796a7 100644
--- a/vendor/sabre/dav/lib/Sabre/CardDAV/AddressBook.php
+++ b/vendor/sabre/dav/lib/Sabre/CardDAV/AddressBook.php
@@ -10,7 +10,7 @@ use Sabre\DAVACL;
*
* The AddressBook can contain multiple vcards
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CardDAV/AddressBookQueryParser.php b/vendor/sabre/dav/lib/Sabre/CardDAV/AddressBookQueryParser.php
index 2b5cd209d..101e80ead 100644
--- a/vendor/sabre/dav/lib/Sabre/CardDAV/AddressBookQueryParser.php
+++ b/vendor/sabre/dav/lib/Sabre/CardDAV/AddressBookQueryParser.php
@@ -10,7 +10,7 @@ use Sabre\DAV;
* Whoever designed this format, and the CalDAV equivalent even more so,
* has no feel for design.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CardDAV/AddressBookRoot.php b/vendor/sabre/dav/lib/Sabre/CardDAV/AddressBookRoot.php
index acee40efc..2398fdfe9 100644
--- a/vendor/sabre/dav/lib/Sabre/CardDAV/AddressBookRoot.php
+++ b/vendor/sabre/dav/lib/Sabre/CardDAV/AddressBookRoot.php
@@ -9,7 +9,7 @@ use Sabre\DAVACL;
*
* This object lists a collection of users, which can contain addressbooks.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CardDAV/Backend/AbstractBackend.php b/vendor/sabre/dav/lib/Sabre/CardDAV/Backend/AbstractBackend.php
index 363b73afa..06e848539 100644
--- a/vendor/sabre/dav/lib/Sabre/CardDAV/Backend/AbstractBackend.php
+++ b/vendor/sabre/dav/lib/Sabre/CardDAV/Backend/AbstractBackend.php
@@ -9,7 +9,7 @@ namespace Sabre\CardDAV\Backend;
*
* This class doesn't do much, but it was added for consistency.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CardDAV/Backend/BackendInterface.php b/vendor/sabre/dav/lib/Sabre/CardDAV/Backend/BackendInterface.php
index c4607c217..3bb5bd98b 100644
--- a/vendor/sabre/dav/lib/Sabre/CardDAV/Backend/BackendInterface.php
+++ b/vendor/sabre/dav/lib/Sabre/CardDAV/Backend/BackendInterface.php
@@ -11,7 +11,7 @@ namespace Sabre\CardDAV\Backend;
* class. The value of the addressBookId is completely up to you, it can be any
* arbitrary value you can use as an unique identifier.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CardDAV/Backend/PDO.php b/vendor/sabre/dav/lib/Sabre/CardDAV/Backend/PDO.php
index 014aeb491..0614498ff 100644
--- a/vendor/sabre/dav/lib/Sabre/CardDAV/Backend/PDO.php
+++ b/vendor/sabre/dav/lib/Sabre/CardDAV/Backend/PDO.php
@@ -10,7 +10,7 @@ use Sabre\DAV;
*
* This CardDAV backend uses PDO to store addressbooks
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CardDAV/Card.php b/vendor/sabre/dav/lib/Sabre/CardDAV/Card.php
index 93ad7d2ac..b3eaf410b 100644
--- a/vendor/sabre/dav/lib/Sabre/CardDAV/Card.php
+++ b/vendor/sabre/dav/lib/Sabre/CardDAV/Card.php
@@ -9,7 +9,7 @@ use Sabre\DAV;
/**
* The Card object represents a single Card from an addressbook
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CardDAV/IAddressBook.php b/vendor/sabre/dav/lib/Sabre/CardDAV/IAddressBook.php
index ebb8e2b63..bd4ac600f 100644
--- a/vendor/sabre/dav/lib/Sabre/CardDAV/IAddressBook.php
+++ b/vendor/sabre/dav/lib/Sabre/CardDAV/IAddressBook.php
@@ -9,7 +9,7 @@ use Sabre\DAV;
*
* Implement this interface to allow a node to be recognized as an addressbook.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CardDAV/ICard.php b/vendor/sabre/dav/lib/Sabre/CardDAV/ICard.php
index f12ad9a1d..af28d3830 100644
--- a/vendor/sabre/dav/lib/Sabre/CardDAV/ICard.php
+++ b/vendor/sabre/dav/lib/Sabre/CardDAV/ICard.php
@@ -10,7 +10,7 @@ use Sabre\DAV;
* Extend the ICard interface to allow your custom nodes to be picked up as
* 'Cards'.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CardDAV/IDirectory.php b/vendor/sabre/dav/lib/Sabre/CardDAV/IDirectory.php
index f0cfd59a0..5dfe4832d 100644
--- a/vendor/sabre/dav/lib/Sabre/CardDAV/IDirectory.php
+++ b/vendor/sabre/dav/lib/Sabre/CardDAV/IDirectory.php
@@ -11,7 +11,7 @@ namespace Sabre\CardDAV;
* A full description can be found in the IETF draft:
* - draft-daboo-carddav-directory-gateway
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CardDAV/Plugin.php b/vendor/sabre/dav/lib/Sabre/CardDAV/Plugin.php
index 7d8d80fd3..e7a0f0aba 100644
--- a/vendor/sabre/dav/lib/Sabre/CardDAV/Plugin.php
+++ b/vendor/sabre/dav/lib/Sabre/CardDAV/Plugin.php
@@ -11,7 +11,7 @@ use Sabre\VObject;
*
* The CardDAV plugin adds CardDAV functionality to the WebDAV server
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CardDAV/Property/SupportedAddressData.php b/vendor/sabre/dav/lib/Sabre/CardDAV/Property/SupportedAddressData.php
index b2bb6b551..208efabe7 100644
--- a/vendor/sabre/dav/lib/Sabre/CardDAV/Property/SupportedAddressData.php
+++ b/vendor/sabre/dav/lib/Sabre/CardDAV/Property/SupportedAddressData.php
@@ -11,7 +11,7 @@ use Sabre\CardDAV;
* This property is a representation of the supported-address-data property
* in the CardDAV namespace.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CardDAV/UserAddressBooks.php b/vendor/sabre/dav/lib/Sabre/CardDAV/UserAddressBooks.php
index dca465b9e..54ea87901 100644
--- a/vendor/sabre/dav/lib/Sabre/CardDAV/UserAddressBooks.php
+++ b/vendor/sabre/dav/lib/Sabre/CardDAV/UserAddressBooks.php
@@ -10,7 +10,7 @@ use Sabre\DAVACL;
*
* The UserAddressBooks collection contains a list of addressbooks associated with a user
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/CardDAV/VCFExportPlugin.php b/vendor/sabre/dav/lib/Sabre/CardDAV/VCFExportPlugin.php
index b1e6f5e48..8889cbd4b 100644
--- a/vendor/sabre/dav/lib/Sabre/CardDAV/VCFExportPlugin.php
+++ b/vendor/sabre/dav/lib/Sabre/CardDAV/VCFExportPlugin.php
@@ -12,7 +12,7 @@ use Sabre\VObject;
* This is useful for clients that don't support CardDAV yet. They often do
* support vcf files.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @author Thomas Tanghus (http://tanghus.net/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
diff --git a/vendor/sabre/dav/lib/Sabre/CardDAV/Version.php b/vendor/sabre/dav/lib/Sabre/CardDAV/Version.php
index 9b691423c..ade46ea00 100644
--- a/vendor/sabre/dav/lib/Sabre/CardDAV/Version.php
+++ b/vendor/sabre/dav/lib/Sabre/CardDAV/Version.php
@@ -7,7 +7,7 @@ namespace Sabre\CardDAV;
*
* This class contains the Sabre\CardDAV version information
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/AbstractBasic.php b/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/AbstractBasic.php
index daa8bd8ad..5ea6f6c7c 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/AbstractBasic.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/AbstractBasic.php
@@ -12,7 +12,7 @@ use Sabre\HTTP;
* Most of the digest logic is handled, implementors just need to worry about
* the validateUserPass method.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author James David Low (http://jameslow.com/)
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/AbstractDigest.php b/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/AbstractDigest.php
index 14993a014..e140f7b3a 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/AbstractDigest.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/AbstractDigest.php
@@ -12,7 +12,7 @@ use Sabre\DAV;
* Most of the digest logic is handled, implementors just need to worry about
* the getDigestHash method
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/Apache.php b/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/Apache.php
index bdde16716..308f5eff2 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/Apache.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/Apache.php
@@ -11,7 +11,7 @@ use Sabre\DAV;
*
* Make sure apache is properly configured for this to work.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/BackendInterface.php b/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/BackendInterface.php
index 140adaa2e..36e472002 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/BackendInterface.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/BackendInterface.php
@@ -5,7 +5,7 @@ namespace Sabre\DAV\Auth\Backend;
/**
* This is the base class for any authentication object.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/File.php b/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/File.php
index c325b1e5b..c7c1047a5 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/File.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/File.php
@@ -9,7 +9,7 @@ use Sabre\DAV;
*
* The backend file must conform to Apache's htdigest format
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/PDO.php b/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/PDO.php
index 1bc6699b7..a5fb5f18c 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/PDO.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Auth/Backend/PDO.php
@@ -7,7 +7,7 @@ namespace Sabre\DAV\Auth\Backend;
*
* The backend file must conform to Apache's htdigest format
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Auth/Plugin.php b/vendor/sabre/dav/lib/Sabre/DAV/Auth/Plugin.php
index fccbcc22f..95c669e4a 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Auth/Plugin.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Auth/Plugin.php
@@ -12,7 +12,7 @@ use Sabre\DAV;
* * {DAV:}current-user-principal property from RFC5397
* * {DAV:}principal-collection-set property from RFC3744
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Browser/GuessContentType.php b/vendor/sabre/dav/lib/Sabre/DAV/Browser/GuessContentType.php
index 36c63f515..41ec4bb8b 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Browser/GuessContentType.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Browser/GuessContentType.php
@@ -15,7 +15,7 @@ use Sabre\DAV;
* so this extension does what the rest of the world does, and guesses it based
* on the file extension.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Browser/MapGetToPropFind.php b/vendor/sabre/dav/lib/Sabre/DAV/Browser/MapGetToPropFind.php
index a429e8f88..ff8452c57 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Browser/MapGetToPropFind.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Browser/MapGetToPropFind.php
@@ -10,7 +10,7 @@ use Sabre\DAV;
*
* This should allow easy debugging of PROPFIND
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Browser/Plugin.php b/vendor/sabre/dav/lib/Sabre/DAV/Browser/Plugin.php
index 5fefc7ee2..0e54f706f 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Browser/Plugin.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Browser/Plugin.php
@@ -13,7 +13,7 @@ use Sabre\DAV;
* The class intercepts GET requests to collection resources and generates a simple
* html index.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
@@ -374,7 +374,7 @@ class Plugin extends DAV\ServerPlugin {
$html.=$output;
$html.= "</table>
- <address>Generated by SabreDAV " . $version . " (c)2007-2013 <a href=\"http://code.google.com/p/sabredav/\">http://code.google.com/p/sabredav/</a></address>
+ <address>Generated by SabreDAV " . $version . " (c)2007-2014 <a href=\"http://code.google.com/p/sabredav/\">http://code.google.com/p/sabredav/</a></address>
</body>
</html>";
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Client.php b/vendor/sabre/dav/lib/Sabre/DAV/Client.php
index b9cf043a2..1cec8ff6f 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Client.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Client.php
@@ -10,7 +10,7 @@ namespace Sabre\DAV;
*
* NOTE: This class is experimental, it's api will likely change in the future.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
@@ -314,7 +314,11 @@ class Client {
CURLOPT_RETURNTRANSFER => true,
// Return headers as part of the response
CURLOPT_HEADER => true,
- CURLOPT_POSTFIELDS => $body,
+
+ // For security we cast this to a string. If somehow an array could
+ // be passed here, it would be possible for an attacker to use @ to
+ // post local files.
+ CURLOPT_POSTFIELDS => (string)$body,
// Automatically follow redirects
CURLOPT_FOLLOWLOCATION => true,
CURLOPT_MAXREDIRS => 5,
@@ -526,7 +530,12 @@ class Client {
$body = XMLUtil::convertDAVNamespace($body);
+ // Fixes an XXE vulnerability on PHP versions older than 5.3.23 or
+ // 5.4.13.
+ $previous = libxml_disable_entity_loader(true);
$responseXML = simplexml_load_string($body, null, LIBXML_NOBLANKS | LIBXML_NOCDATA);
+ libxml_disable_entity_loader($previous);
+
if ($responseXML===false) {
throw new \InvalidArgumentException('The passed data is not valid XML');
}
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Collection.php b/vendor/sabre/dav/lib/Sabre/DAV/Collection.php
index d8d5265b9..9564dd462 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Collection.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Collection.php
@@ -8,7 +8,7 @@ namespace Sabre\DAV;
* This is a helper class, that should aid in getting collections classes setup.
* Most of its methods are implemented, and throw permission denied exceptions
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception.php
index 9c7a985b4..3f99fc4dd 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception.php
@@ -5,7 +5,7 @@
*
* This is SabreDAV's base exception file, use this to implement your own exception.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/BadRequest.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/BadRequest.php
index bcf4c8eb4..2fcd4c04d 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/BadRequest.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/BadRequest.php
@@ -8,7 +8,7 @@ namespace Sabre\DAV\Exception;
* The BadRequest is thrown when the user submitted an invalid HTTP request
* BadRequest
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/Conflict.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/Conflict.php
index 2c8fa8167..b15ca37cc 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/Conflict.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/Conflict.php
@@ -8,7 +8,7 @@ namespace Sabre\DAV\Exception;
* A 409 Conflict is thrown when a user tried to make a directory over an existing
* file or in a parent directory that doesn't exist.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/ConflictingLock.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/ConflictingLock.php
index ba66f243d..33cdf50d8 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/ConflictingLock.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/ConflictingLock.php
@@ -10,7 +10,7 @@ use Sabre\DAV;
* Similar to the Locked exception, this exception thrown when a LOCK request
* was made, on a resource which was already locked
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/FileNotFound.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/FileNotFound.php
index da700ebb0..6743d1d04 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/FileNotFound.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/FileNotFound.php
@@ -8,7 +8,7 @@ namespace Sabre\DAV\Exception;
* Deprecated: Warning, this class is deprecated and will be removed in a
* future version of SabreDAV. Please use Sabre\DAV\Exception\NotFound instead.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @deprecated Use Sabre\DAV\Exception\NotFound instead
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/Forbidden.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/Forbidden.php
index 3c9a46677..6fb5004d7 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/Forbidden.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/Forbidden.php
@@ -7,7 +7,7 @@ namespace Sabre\DAV\Exception;
*
* This exception is thrown whenever a user tries to do an operation he's not allowed to
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/InsufficientStorage.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/InsufficientStorage.php
index 8505ce17f..90aa6abb2 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/InsufficientStorage.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/InsufficientStorage.php
@@ -7,7 +7,7 @@ namespace Sabre\DAV\Exception;
*
* This Exception can be thrown, when for example a harddisk is full or a quota is exceeded
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/InvalidResourceType.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/InvalidResourceType.php
index ce64f2ee0..16162e08f 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/InvalidResourceType.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/InvalidResourceType.php
@@ -10,7 +10,7 @@ namespace Sabre\DAV\Exception;
*
* See RFC5689 section 3.3
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
index a8f8407f0..e99b68d40 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php
@@ -9,7 +9,7 @@ use Sabre\DAV;
*
* This exception is thrown by UNLOCK if a supplied lock-token is invalid
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/Locked.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/Locked.php
index 2f8460be2..000adaac9 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/Locked.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/Locked.php
@@ -9,7 +9,7 @@ use Sabre\DAV;
*
* The 423 is thrown when a client tried to access a resource that was locked, without supplying a valid lock token
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/MethodNotAllowed.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/MethodNotAllowed.php
index 09aeca4c8..7dd97f48f 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/MethodNotAllowed.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/MethodNotAllowed.php
@@ -7,7 +7,7 @@ namespace Sabre\DAV\Exception;
*
* The 405 is thrown when a client tried to create a directory on an already existing directory
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/NotAuthenticated.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/NotAuthenticated.php
index 695edda15..1c4dc2ae9 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/NotAuthenticated.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/NotAuthenticated.php
@@ -10,7 +10,7 @@ use Sabre\DAV;
* This exception is thrown when the client did not provide valid
* authentication credentials.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/NotFound.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/NotFound.php
index 605c650a4..281ba2136 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/NotFound.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/NotFound.php
@@ -7,7 +7,7 @@ namespace Sabre\DAV\Exception;
*
* This Exception is thrown when a Node couldn't be found. It returns HTTP error code 404
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/NotImplemented.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/NotImplemented.php
index 6934a53e5..0b76fb19a 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/NotImplemented.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/NotImplemented.php
@@ -7,7 +7,7 @@ namespace Sabre\DAV\Exception;
*
* This exception is thrown when the client tried to call an unsupported HTTP method or other feature
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/PaymentRequired.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/PaymentRequired.php
index ad053fd79..511403c2b 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/PaymentRequired.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/PaymentRequired.php
@@ -10,7 +10,7 @@ use Sabre\DAV;
* The PaymentRequired exception may be thrown in a case where a user must pay
* to access a certain resource or operation.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/PreconditionFailed.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/PreconditionFailed.php
index 225b99a36..9e51ba01f 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/PreconditionFailed.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/PreconditionFailed.php
@@ -11,7 +11,7 @@ use Sabre\DAV;
* like for example an If, If-None-Match or If-Match header, which caused the HTTP
* request to not execute (the condition of the header failed)
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/ReportNotSupported.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/ReportNotSupported.php
index d55c99bd0..59bee3f34 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/ReportNotSupported.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/ReportNotSupported.php
@@ -9,7 +9,7 @@ use Sabre\DAV;
*
* This exception is thrown when the client requested an unknown report through the REPORT method
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
index 0a8a85808..c33aa9bb1 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php
@@ -10,7 +10,7 @@ use Sabre\DAV;
* This exception is normally thrown when the user
* request a range that is out of the entity bounds.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/ServiceUnavailable.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/ServiceUnavailable.php
index dca764899..157687c6e 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/ServiceUnavailable.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/ServiceUnavailable.php
@@ -11,7 +11,7 @@ use Sabre\DAV;
* is currently not available (e.g. down for maintenance).
*
* @author Thomas Müller <thomas.mueller@tmit.eu>
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class ServiceUnavailable extends DAV\Exception {
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Exception/UnsupportedMediaType.php b/vendor/sabre/dav/lib/Sabre/DAV/Exception/UnsupportedMediaType.php
index 38f5a9fac..293c9b7b9 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Exception/UnsupportedMediaType.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Exception/UnsupportedMediaType.php
@@ -8,7 +8,7 @@ namespace Sabre\DAV\Exception;
* The 415 Unsupported Media Type status code is generally sent back when the client
* tried to call an HTTP method, with a body the server didn't understand
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/FS/Directory.php b/vendor/sabre/dav/lib/Sabre/DAV/FS/Directory.php
index 333492d17..8a6d1f038 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/FS/Directory.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/FS/Directory.php
@@ -6,7 +6,7 @@ use Sabre\DAV;
/**
* Directory class
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/FS/File.php b/vendor/sabre/dav/lib/Sabre/DAV/FS/File.php
index 437a4dd78..b15883555 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/FS/File.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/FS/File.php
@@ -7,7 +7,7 @@ use Sabre\DAV;
/**
* File class
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/FS/Node.php b/vendor/sabre/dav/lib/Sabre/DAV/FS/Node.php
index 4f52e1683..dc31bdfe9 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/FS/Node.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/FS/Node.php
@@ -9,7 +9,7 @@ use Sabre\DAV;
*
* The node class implements the method used by both the File and the Directory classes
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/FSExt/Directory.php b/vendor/sabre/dav/lib/Sabre/DAV/FSExt/Directory.php
index c27ad5ba5..e547b368a 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/FSExt/Directory.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/FSExt/Directory.php
@@ -7,7 +7,7 @@ use Sabre\DAV;
/**
* Directory class
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/FSExt/File.php b/vendor/sabre/dav/lib/Sabre/DAV/FSExt/File.php
index 402195757..e895d9140 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/FSExt/File.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/FSExt/File.php
@@ -6,7 +6,7 @@ use Sabre\DAV;
/**
* File class
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/FSExt/Node.php b/vendor/sabre/dav/lib/Sabre/DAV/FSExt/Node.php
index 4fb6c9a9a..285ab496a 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/FSExt/Node.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/FSExt/Node.php
@@ -9,7 +9,7 @@ use Sabre\DAV;
*
* The node class implements the method used by both the File and the Directory classes
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/File.php b/vendor/sabre/dav/lib/Sabre/DAV/File.php
index 10f56c540..4ab25530d 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/File.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/File.php
@@ -8,7 +8,7 @@ namespace Sabre\DAV;
* This is a helper class, that should aid in getting file classes setup.
* Most of its methods are implemented, and throw permission denied exceptions
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/ICollection.php b/vendor/sabre/dav/lib/Sabre/DAV/ICollection.php
index 3f26c1245..2c4d95456 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/ICollection.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/ICollection.php
@@ -7,7 +7,7 @@ namespace Sabre\DAV;
*
* This interface should be implemented by each class that represents a collection
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/IExtendedCollection.php b/vendor/sabre/dav/lib/Sabre/DAV/IExtendedCollection.php
index 50ae3f4d2..45ab8630f 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/IExtendedCollection.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/IExtendedCollection.php
@@ -8,7 +8,7 @@ namespace Sabre\DAV;
* This interface can be used to create special-type of collection-resources
* as defined by RFC 5689.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/IFile.php b/vendor/sabre/dav/lib/Sabre/DAV/IFile.php
index 025b0213d..1df454db2 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/IFile.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/IFile.php
@@ -9,7 +9,7 @@ namespace Sabre\DAV;
* this specific node a PUT or GET method may be performed, to either update,
* or retrieve the contents of the file.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/INode.php b/vendor/sabre/dav/lib/Sabre/DAV/INode.php
index c3f3c4abd..f59dca754 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/INode.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/INode.php
@@ -5,7 +5,7 @@ namespace Sabre\DAV;
/**
* The INode interface is the base interface, and the parent class of both ICollection and IFile
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/IProperties.php b/vendor/sabre/dav/lib/Sabre/DAV/IProperties.php
index 5e0124549..7f0d8b259 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/IProperties.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/IProperties.php
@@ -7,7 +7,7 @@ namespace Sabre\DAV;
*
* Implement this interface to support custom WebDAV properties requested and sent from clients.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/IQuota.php b/vendor/sabre/dav/lib/Sabre/DAV/IQuota.php
index 463c0f0db..60fedb5a5 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/IQuota.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/IQuota.php
@@ -9,7 +9,7 @@ namespace Sabre\DAV;
* will check for quota information on any given node. If the information is not available it will
* attempt to fetch the information from the root node.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/AbstractBackend.php b/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/AbstractBackend.php
index 78fa8aa9a..fa13f462c 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/AbstractBackend.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/AbstractBackend.php
@@ -11,7 +11,7 @@ use Sabre\DAV\Locks;
* to ensure that if default code is required in the backend, there will be a
* non-bc-breaking way to do so.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/BackendInterface.php b/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/BackendInterface.php
index 7665a10b5..7bd7d572d 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/BackendInterface.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/BackendInterface.php
@@ -8,7 +8,7 @@ use Sabre\DAV\Locks;
* If you are defining your own Locks backend, you must implement this
* interface.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/FS.php b/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/FS.php
index b77d8b5af..971db9740 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/FS.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/FS.php
@@ -17,7 +17,7 @@ use Sabre\DAV\Locks\LockInfo;
* You are recommended to use either the PDO or the File backend instead.
*
* @deprecated
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/File.php b/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/File.php
index 22d31e347..c62e1d465 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/File.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/File.php
@@ -12,7 +12,7 @@ use Sabre\DAV\Locks\LockInfo;
* Note that this is not nearly as robust as a database, you are encouraged
* to use the PDO backend instead.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/PDO.php b/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/PDO.php
index cb9f633cc..3617daafc 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/PDO.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Locks/Backend/PDO.php
@@ -10,7 +10,7 @@ use Sabre\DAV\Locks\LockInfo;
* This Lock Manager stores all its data in a database. You must pass a PDO
* connection object in the constructor.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Locks/LockInfo.php b/vendor/sabre/dav/lib/Sabre/DAV/Locks/LockInfo.php
index f7178a819..d3588ac10 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Locks/LockInfo.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Locks/LockInfo.php
@@ -8,7 +8,7 @@ namespace Sabre\DAV\Locks;
* An object of the LockInfo class holds all the information relevant to a
* single lock.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Locks/Plugin.php b/vendor/sabre/dav/lib/Sabre/DAV/Locks/Plugin.php
index ece363e1b..34e1b53f9 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Locks/Plugin.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Locks/Plugin.php
@@ -14,7 +14,7 @@ use Sabre\DAV;
* $lockPlugin = new Sabre\DAV\Locks\Plugin($lockBackend);
* $server->addPlugin($lockPlugin);
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
@@ -621,10 +621,17 @@ class Plugin extends DAV\ServerPlugin {
*/
protected function parseLockRequest($body) {
+ // Fixes an XXE vulnerability on PHP versions older than 5.3.23 or
+ // 5.4.13.
+ $previous = libxml_disable_entity_loader(true);
+
+
$xml = simplexml_load_string(
DAV\XMLUtil::convertDAVNamespace($body),
null,
LIBXML_NOWARNING);
+ libxml_disable_entity_loader($previous);
+
$xml->registerXPathNamespace('d','urn:DAV');
$lockInfo = new LockInfo();
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Mount/Plugin.php b/vendor/sabre/dav/lib/Sabre/DAV/Mount/Plugin.php
index 669acafc0..23f7f31e2 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Mount/Plugin.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Mount/Plugin.php
@@ -9,7 +9,7 @@ use Sabre\DAV;
*
* Simply append ?mount to any collection to generate the davmount response.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Node.php b/vendor/sabre/dav/lib/Sabre/DAV/Node.php
index 53c4b831a..3619ac250 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Node.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Node.php
@@ -7,7 +7,7 @@ namespace Sabre\DAV;
*
* This is a helper class, that should aid in getting nodes setup.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/ObjectTree.php b/vendor/sabre/dav/lib/Sabre/DAV/ObjectTree.php
index fda55e19a..5bdfdffe6 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/ObjectTree.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/ObjectTree.php
@@ -7,7 +7,7 @@ namespace Sabre\DAV;
*
* This implementation of the Tree class makes use of the INode, IFile and ICollection API's
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/PartialUpdate/IFile.php b/vendor/sabre/dav/lib/Sabre/DAV/PartialUpdate/IFile.php
index 15598a010..69c41b008 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/PartialUpdate/IFile.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/PartialUpdate/IFile.php
@@ -9,7 +9,7 @@ use Sabre\DAV;
* It may be used to update a file chunk, upload big a file into smaller
* chunks or resume an upload
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Jean-Tiare LE BIGOT (http://www.jtlebi.fr/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/PartialUpdate/Plugin.php b/vendor/sabre/dav/lib/Sabre/DAV/PartialUpdate/Plugin.php
index cc06c8369..26188a1fa 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/PartialUpdate/Plugin.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/PartialUpdate/Plugin.php
@@ -14,7 +14,7 @@ use Sabre\DAV;
* $patchPlugin = new \Sabre\DAV\PartialUpdate\Plugin();
* $server->addPlugin($patchPlugin);
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Jean-Tiare LE BIGOT (http://www.jtlebi.fr/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Property.php b/vendor/sabre/dav/lib/Sabre/DAV/Property.php
index 00f0df3fe..c5943f1b0 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Property.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Property.php
@@ -7,7 +7,7 @@ namespace Sabre\DAV;
*
* Extend this class to create custom complex properties
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Property/GetLastModified.php b/vendor/sabre/dav/lib/Sabre/DAV/Property/GetLastModified.php
index 9240f55cc..b0b950535 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Property/GetLastModified.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Property/GetLastModified.php
@@ -14,7 +14,7 @@ use Sabre\HTTP;
* This class uses unix timestamps internally, and converts them to RFC 1123 times for
* serialization
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Property/Href.php b/vendor/sabre/dav/lib/Sabre/DAV/Property/Href.php
index ac198c723..e51d4e3f7 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Property/Href.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Property/Href.php
@@ -10,7 +10,7 @@ use Sabre\DAV;
* The href property represents a url within a {DAV:}href element.
* This is used by many WebDAV extensions, but not really within the WebDAV core spec
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Property/HrefList.php b/vendor/sabre/dav/lib/Sabre/DAV/Property/HrefList.php
index 3eab755ca..e0cca68cd 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Property/HrefList.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Property/HrefList.php
@@ -9,7 +9,7 @@ use Sabre\DAV;
*
* This property contains multiple {DAV:}href elements, each containing a url.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Property/IHref.php b/vendor/sabre/dav/lib/Sabre/DAV/Property/IHref.php
index a4ae09b3f..473c1942f 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Property/IHref.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Property/IHref.php
@@ -9,7 +9,7 @@ namespace Sabre\DAV\Property;
* This is used by certain subsystems to aquire more information about for example
* the owner of a file
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Property/LockDiscovery.php b/vendor/sabre/dav/lib/Sabre/DAV/Property/LockDiscovery.php
index 3b36ca6a7..52095f733 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Property/LockDiscovery.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Property/LockDiscovery.php
@@ -9,7 +9,7 @@ use Sabre\DAV;
*
* This property contains all the open locks on a given resource
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Property/ResourceType.php b/vendor/sabre/dav/lib/Sabre/DAV/Property/ResourceType.php
index 9582d5598..e5ce84b7f 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Property/ResourceType.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Property/ResourceType.php
@@ -10,7 +10,7 @@ use Sabre\DAV;
* Normally for files this is empty, and for collection {DAV:}collection.
* However, other specs define different values for this.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Property/Response.php b/vendor/sabre/dav/lib/Sabre/DAV/Property/Response.php
index 58e90d89d..16aa23168 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Property/Response.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Property/Response.php
@@ -11,7 +11,7 @@ use Sabre\DAV;
* This is used by the Server class to encode individual items within a multistatus
* response.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Property/ResponseList.php b/vendor/sabre/dav/lib/Sabre/DAV/Property/ResponseList.php
index b605a4e9a..d9840f585 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Property/ResponseList.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Property/ResponseList.php
@@ -11,7 +11,7 @@ use Sabre\DAV;
* This is used by the Server class to encode items within a multistatus
* response.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Property/SupportedLock.php b/vendor/sabre/dav/lib/Sabre/DAV/Property/SupportedLock.php
index e6f477c38..1bab4e0be 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Property/SupportedLock.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Property/SupportedLock.php
@@ -10,7 +10,7 @@ use Sabre\DAV;
* This property contains information about what kind of locks
* this server supports.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Property/SupportedReportSet.php b/vendor/sabre/dav/lib/Sabre/DAV/Property/SupportedReportSet.php
index 993105b8a..d5ed32c42 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Property/SupportedReportSet.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Property/SupportedReportSet.php
@@ -10,7 +10,7 @@ use Sabre\DAV;
* This property is defined in RFC3253, but since it's
* so common in other webdav-related specs, it is part of the core server.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/PropertyInterface.php b/vendor/sabre/dav/lib/Sabre/DAV/PropertyInterface.php
index 856e643f3..f3b8862aa 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/PropertyInterface.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/PropertyInterface.php
@@ -7,7 +7,7 @@ namespace Sabre\DAV;
*
* Implement this interface to create new complex properties
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Server.php b/vendor/sabre/dav/lib/Sabre/DAV/Server.php
index 11ac642d6..4aa6cacd4 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Server.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Server.php
@@ -6,7 +6,7 @@ use Sabre\HTTP;
/**
* Main DAV server class
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/ServerPlugin.php b/vendor/sabre/dav/lib/Sabre/DAV/ServerPlugin.php
index b8396abaf..44bd037b9 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/ServerPlugin.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/ServerPlugin.php
@@ -7,7 +7,7 @@ namespace Sabre\DAV;
*
* Plugins can modify or extend the servers behaviour.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/SimpleCollection.php b/vendor/sabre/dav/lib/Sabre/DAV/SimpleCollection.php
index c38c39e72..17af83c8c 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/SimpleCollection.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/SimpleCollection.php
@@ -8,7 +8,7 @@ namespace Sabre\DAV;
* The SimpleCollection is used to quickly setup static directory structures.
* Just create the object with a proper name, and add children to use it.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/SimpleFile.php b/vendor/sabre/dav/lib/Sabre/DAV/SimpleFile.php
index 694207eec..4c3b673ae 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/SimpleFile.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/SimpleFile.php
@@ -9,7 +9,7 @@ namespace Sabre\DAV;
* the directory structure. One usecase would be to add a 'readme.txt' to a
* root of a webserver with some standard content.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/StringUtil.php b/vendor/sabre/dav/lib/Sabre/DAV/StringUtil.php
index 0f299bf11..1f42694a5 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/StringUtil.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/StringUtil.php
@@ -9,7 +9,7 @@ namespace Sabre\DAV;
* the CalDAV calendar-query REPORT, and CardDAV addressbook-query REPORT.
* Because they both need it, it was decided to put it in Sabre\DAV instead.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/TemporaryFileFilterPlugin.php b/vendor/sabre/dav/lib/Sabre/DAV/TemporaryFileFilterPlugin.php
index d1ae18d5b..6c3f05b56 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/TemporaryFileFilterPlugin.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/TemporaryFileFilterPlugin.php
@@ -22,7 +22,7 @@ namespace Sabre\DAV;
* Additional patterns can be added, by adding on to the
* temporaryFilePatterns property.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Tree.php b/vendor/sabre/dav/lib/Sabre/DAV/Tree.php
index af08c39f0..196b6024b 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Tree.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Tree.php
@@ -5,7 +5,7 @@ namespace Sabre\DAV;
/**
* Abstract tree object
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Tree/Filesystem.php b/vendor/sabre/dav/lib/Sabre/DAV/Tree/Filesystem.php
index 9004f678a..2e478b306 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Tree/Filesystem.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Tree/Filesystem.php
@@ -13,7 +13,7 @@ use Sabre\DAV;
*
* Specifically copying and moving are much, much faster.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/URLUtil.php b/vendor/sabre/dav/lib/Sabre/DAV/URLUtil.php
index b71ea003d..1ab874077 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/URLUtil.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/URLUtil.php
@@ -14,7 +14,10 @@ namespace Sabre\DAV;
* ). Since these are reserved, but don't have a reserved meaning in url, these characters are
* kept as-is.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * It was also discovered that versions of the SOGO connector for thunderbird
+ * has issues with urlencoded colons.
+ *
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
@@ -30,7 +33,7 @@ class URLUtil {
*/
static function encodePath($path) {
- return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)\/])/',function($match) {
+ return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)\/:])/',function($match) {
return '%'.sprintf('%02x',ord($match[0]));
@@ -48,7 +51,7 @@ class URLUtil {
*/
static function encodePathSegment($pathSegment) {
- return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)])/',function($match) {
+ return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\):])/',function($match) {
return '%'.sprintf('%02x',ord($match[0]));
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/UUIDUtil.php b/vendor/sabre/dav/lib/Sabre/DAV/UUIDUtil.php
index e6b78fac6..f20e1cba0 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/UUIDUtil.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/UUIDUtil.php
@@ -9,7 +9,7 @@ namespace Sabre\DAV;
* UUIDs are used a decent amount within various *DAV standards, so it made
* sense to include it.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/Version.php b/vendor/sabre/dav/lib/Sabre/DAV/Version.php
index c82bc17e3..c15de9de9 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/Version.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/Version.php
@@ -5,7 +5,7 @@ namespace Sabre\DAV;
/**
* This class contains the SabreDAV version constants.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
@@ -14,7 +14,7 @@ class Version {
/**
* Full version number
*/
- const VERSION = '1.8.7';
+ const VERSION = '1.8.9';
/**
* Stability : alpha, beta, stable
diff --git a/vendor/sabre/dav/lib/Sabre/DAV/XMLUtil.php b/vendor/sabre/dav/lib/Sabre/DAV/XMLUtil.php
index 298398da0..046a59162 100644
--- a/vendor/sabre/dav/lib/Sabre/DAV/XMLUtil.php
+++ b/vendor/sabre/dav/lib/Sabre/DAV/XMLUtil.php
@@ -5,7 +5,7 @@ namespace Sabre\DAV;
/**
* XML utilities for WebDAV
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
@@ -113,6 +113,9 @@ class XMLUtil {
// Retaining old error setting
$oldErrorSetting = libxml_use_internal_errors(true);
+ // Fixes an XXE vulnerability on PHP versions older than 5.3.23 or
+ // 5.4.13.
+ $oldEntityLoaderSetting = libxml_disable_entity_loader(true);
// Clearing any previous errors
libxml_clear_errors();
@@ -121,7 +124,7 @@ class XMLUtil {
// We don't generally care about any whitespace
$dom->preserveWhiteSpace = false;
-
+
$dom->loadXML(self::convertDAVNamespace($xml),LIBXML_NOWARNING | LIBXML_NOERROR);
if ($error = libxml_get_last_error()) {
@@ -131,6 +134,7 @@ class XMLUtil {
// Restoring old mechanism for error handling
if ($oldErrorSetting===false) libxml_use_internal_errors(false);
+ if ($oldEntityLoaderSetting===false) libxml_disable_entity_loader(true);
return $dom;
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/AbstractPrincipalCollection.php b/vendor/sabre/dav/lib/Sabre/DAVACL/AbstractPrincipalCollection.php
index 3f9a080d4..a0bd88b1e 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/AbstractPrincipalCollection.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/AbstractPrincipalCollection.php
@@ -11,7 +11,7 @@ use Sabre\DAV;
*
* To use this class, simply implement the getChildForPrincipal method.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/AceConflict.php b/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/AceConflict.php
index 25c8b7f4c..17cf31300 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/AceConflict.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/AceConflict.php
@@ -8,7 +8,7 @@ use Sabre\DAV;
* This exception is thrown when a client attempts to set conflicting
* permissions.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NeedPrivileges.php b/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NeedPrivileges.php
index 5ec4a8e88..443215f00 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NeedPrivileges.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NeedPrivileges.php
@@ -10,7 +10,7 @@ use Sabre\DAV;
* The 403-need privileges is thrown when a user didn't have the appropriate
* permissions to perform an operation
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NoAbstract.php b/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NoAbstract.php
index 836153ef1..98aed0878 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NoAbstract.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NoAbstract.php
@@ -8,7 +8,7 @@ use Sabre\DAV;
* This exception is thrown when a user tries to set a privilege that's marked
* as abstract.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php b/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
index 753945b3d..4cb560004 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php
@@ -8,7 +8,7 @@ use Sabre\DAV;
* If a client tried to set a privilege assigned to a non-existant principal,
* this exception will be thrown.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php b/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
index aa976334f..a2fbfd352 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php
@@ -8,7 +8,7 @@ use Sabre\DAV;
* If a client tried to set a privilege that doesn't exist, this exception will
* be thrown.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/IACL.php b/vendor/sabre/dav/lib/Sabre/DAVACL/IACL.php
index 2fbfb5463..87d0565d6 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/IACL.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/IACL.php
@@ -8,7 +8,7 @@ use Sabre\DAV;
*
* If you want to add WebDAV ACL to a node, you must implement this class
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/IPrincipal.php b/vendor/sabre/dav/lib/Sabre/DAVACL/IPrincipal.php
index 87e3f4ec5..7ebb9518f 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/IPrincipal.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/IPrincipal.php
@@ -9,7 +9,7 @@ use Sabre\DAV;
*
* Implement this interface to define your own principals
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/IPrincipalCollection.php b/vendor/sabre/dav/lib/Sabre/DAVACL/IPrincipalCollection.php
index 33ffd3317..655f9ba6d 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/IPrincipalCollection.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/IPrincipalCollection.php
@@ -10,7 +10,7 @@ use Sabre\DAV;
* Implement this interface to ensure that your principal collection can be
* searched using the principal-property-search REPORT.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/Plugin.php b/vendor/sabre/dav/lib/Sabre/DAVACL/Plugin.php
index 1609d942f..558d1c5ac 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/Plugin.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/Plugin.php
@@ -13,7 +13,7 @@ use Sabre\DAV;
* property, defined in RFC5397 and the {DAV:}expand-property report, as
* defined in RFC3253.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/Principal.php b/vendor/sabre/dav/lib/Sabre/DAVACL/Principal.php
index 267100212..549d6397b 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/Principal.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/Principal.php
@@ -15,7 +15,7 @@ use Sabre\DAV;
* This principal also has basic ACL settings, only allowing the principal
* access it's own principal.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalBackend/AbstractBackend.php b/vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalBackend/AbstractBackend.php
index 234d334e8..0336a3d17 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalBackend/AbstractBackend.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalBackend/AbstractBackend.php
@@ -9,7 +9,7 @@ namespace Sabre\DAVACL\PrincipalBackend;
* have a non-bc-breaking way to add a default generic implementation to
* functions we may add in the future.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php b/vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php
index 6bb21e566..8ff2fca39 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php
@@ -9,7 +9,7 @@ namespace Sabre\DAVACL\PrincipalBackend;
* implement Sabre\DAVACL\IPrincipal directly. This interface is used solely by
* Sabre\DAVACL\AbstractPrincipalCollection.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalBackend/PDO.php b/vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalBackend/PDO.php
index 17c271150..5fb3d56da 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalBackend/PDO.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalBackend/PDO.php
@@ -12,7 +12,7 @@ use Sabre\DAVACL;
* This backend assumes all principals are in a single collection. The default collection
* is 'principals/', but this can be overriden.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalCollection.php b/vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalCollection.php
index 32216311b..8caa65a08 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalCollection.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/PrincipalCollection.php
@@ -8,7 +8,7 @@ namespace Sabre\DAVACL;
* This collection represents a list of users.
* The users are instances of Sabre\DAVACL\Principal
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/Property/Acl.php b/vendor/sabre/dav/lib/Sabre/DAVACL/Property/Acl.php
index 158628c30..d0bf6b763 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/Property/Acl.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/Property/Acl.php
@@ -7,7 +7,7 @@ use Sabre\DAV;
/**
* This class represents the {DAV:}acl property
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/Property/AclRestrictions.php b/vendor/sabre/dav/lib/Sabre/DAVACL/Property/AclRestrictions.php
index fa79b4af0..47e2ef732 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/Property/AclRestrictions.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/Property/AclRestrictions.php
@@ -9,7 +9,7 @@ use Sabre\DAV;
*
* This property represents {DAV:}acl-restrictions, as defined in RFC3744.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php b/vendor/sabre/dav/lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
index 5b7a81ccb..c6d946bc6 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php
@@ -10,7 +10,7 @@ use Sabre\DAV;
* This class represents the current-user-privilege-set property. When
* requested, it contain all the privileges a user has on a specific node.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/Property/Principal.php b/vendor/sabre/dav/lib/Sabre/DAVACL/Property/Principal.php
index 951ef7f8e..5a32c0942 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/Property/Principal.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/Property/Principal.php
@@ -9,7 +9,7 @@ use Sabre\DAV;
* The principal property represents a principal from RFC3744 (ACL).
* The property can be used to specify a principal or pseudo principals.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php b/vendor/sabre/dav/lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
index ee074fff5..19a121058 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php
@@ -14,7 +14,7 @@ use Sabre\DAV;
* Sabre\DAVACL\Plugin::getSupportedPrivilegeSet as the argument in its
* constructor.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/DAVACL/Version.php b/vendor/sabre/dav/lib/Sabre/DAVACL/Version.php
index b01e2e65b..6782544e6 100644
--- a/vendor/sabre/dav/lib/Sabre/DAVACL/Version.php
+++ b/vendor/sabre/dav/lib/Sabre/DAVACL/Version.php
@@ -5,7 +5,7 @@ namespace Sabre\DAVACL;
/**
* This class contains the SabreDAV version constants.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/HTTP/AWSAuth.php b/vendor/sabre/dav/lib/Sabre/HTTP/AWSAuth.php
index f697f23f1..018412517 100644
--- a/vendor/sabre/dav/lib/Sabre/HTTP/AWSAuth.php
+++ b/vendor/sabre/dav/lib/Sabre/HTTP/AWSAuth.php
@@ -7,7 +7,7 @@ namespace Sabre\HTTP;
*
* Use this class to leverage amazon's AWS authentication header
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/HTTP/AbstractAuth.php b/vendor/sabre/dav/lib/Sabre/HTTP/AbstractAuth.php
index 886e34737..a00772966 100644
--- a/vendor/sabre/dav/lib/Sabre/HTTP/AbstractAuth.php
+++ b/vendor/sabre/dav/lib/Sabre/HTTP/AbstractAuth.php
@@ -7,7 +7,7 @@ namespace Sabre\HTTP;
*
* This class has the common functionality for BasicAuth and DigestAuth
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/HTTP/BasicAuth.php b/vendor/sabre/dav/lib/Sabre/HTTP/BasicAuth.php
index 36aa31cbc..179c01dea 100644
--- a/vendor/sabre/dav/lib/Sabre/HTTP/BasicAuth.php
+++ b/vendor/sabre/dav/lib/Sabre/HTTP/BasicAuth.php
@@ -7,7 +7,7 @@ namespace Sabre\HTTP;
*
* Use this class for easy http authentication setup
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/HTTP/DigestAuth.php b/vendor/sabre/dav/lib/Sabre/HTTP/DigestAuth.php
index 19b58eba3..bac8cc8da 100644
--- a/vendor/sabre/dav/lib/Sabre/HTTP/DigestAuth.php
+++ b/vendor/sabre/dav/lib/Sabre/HTTP/DigestAuth.php
@@ -21,7 +21,7 @@ namespace Sabre\HTTP;
* requireLogin() method.
*
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/HTTP/Request.php b/vendor/sabre/dav/lib/Sabre/HTTP/Request.php
index b0f1e62bf..53daf7182 100644
--- a/vendor/sabre/dav/lib/Sabre/HTTP/Request.php
+++ b/vendor/sabre/dav/lib/Sabre/HTTP/Request.php
@@ -12,7 +12,7 @@ namespace Sabre\HTTP;
* request per run it can operate as a singleton. For more information check out
* the behaviour around 'defaultInputStream'.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/lib/Sabre/HTTP/Response.php b/vendor/sabre/dav/lib/Sabre/HTTP/Response.php
index fd7c0bc38..df692a7a6 100644
--- a/vendor/sabre/dav/lib/Sabre/HTTP/Response.php
+++ b/vendor/sabre/dav/lib/Sabre/HTTP/Response.php
@@ -7,7 +7,7 @@ namespace Sabre\HTTP;
*
* It contains the HTTP status code, response headers and a message body.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
@@ -161,7 +161,7 @@ class Response {
if (is_resource($body)) {
- fpassthru($body);
+ file_put_contents('php://output', $body);
} else {
diff --git a/vendor/sabre/dav/lib/Sabre/HTTP/Util.php b/vendor/sabre/dav/lib/Sabre/HTTP/Util.php
index 42fd0a003..e16a0ad37 100644
--- a/vendor/sabre/dav/lib/Sabre/HTTP/Util.php
+++ b/vendor/sabre/dav/lib/Sabre/HTTP/Util.php
@@ -5,7 +5,7 @@ namespace Sabre\HTTP;
/**
* HTTP utility methods
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @author Paul Voegler
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
diff --git a/vendor/sabre/dav/lib/Sabre/HTTP/Version.php b/vendor/sabre/dav/lib/Sabre/HTTP/Version.php
index f4b70437f..8ca171289 100644
--- a/vendor/sabre/dav/lib/Sabre/HTTP/Version.php
+++ b/vendor/sabre/dav/lib/Sabre/HTTP/Version.php
@@ -5,7 +5,7 @@ namespace Sabre\HTTP;
/**
* This class contains the Sabre\HTTP version constants.
*
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
@@ -14,7 +14,7 @@ class Version {
/**
* Full version number
*/
- const VERSION = '1.8.1';
+ const VERSION = '1.8.9';
/**
* Stability : alpha, beta, stable
diff --git a/vendor/sabre/dav/lib/Sabre/autoload.php b/vendor/sabre/dav/lib/Sabre/autoload.php
index 8ae127350..2de197c9c 100644
--- a/vendor/sabre/dav/lib/Sabre/autoload.php
+++ b/vendor/sabre/dav/lib/Sabre/autoload.php
@@ -10,7 +10,7 @@
* instead.
*
* @deprecated Will be removed in a future version!
- * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
* @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php
index 5a78a0522..511288480 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php
@@ -8,8 +8,8 @@ use Sabre\VObject;
* This unittests is created to find out why recurring events have wrong DTSTART value
*
*
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class ExpandEventsDTSTARTandDTENDTest extends \Sabre\DAVServerTest {
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php
index a179bf7f8..d5e9ff5ab 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php
@@ -7,9 +7,8 @@ use Sabre\VObject;
/**
* This unittests is created to find out why recurring events have wrong DTSTART value
*
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class ExpandEventsDTSTARTandDTENDbyDayTest extends \Sabre\DAVServerTest {
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php
index 96e7c6f09..e5a13f77b 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php
@@ -11,8 +11,8 @@ use Sabre\VObject;
* Hopefully, by the time I'm done with this, I've both found the problem, and
* fixed it :)
*
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class ExpandEventsDoubleEventsTest extends \Sabre\DAVServerTest {
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php b/vendor/sabre/dav/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
index 4e4c2cbf1..e473cdeb1 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php
@@ -7,9 +7,8 @@ use Sabre\VObject;
/**
* This unittest is created to check if queries for time-range include the start timestamp or not
*
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class GetEventsByTimerangeTest extends \Sabre\DAVServerTest {
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue203Test.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue203Test.php
index 8cc8ad31f..a27e3a9e5 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue203Test.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue203Test.php
@@ -8,8 +8,8 @@ use Sabre\VObject;
* This unittest is created to find out why an overwritten DAILY event has wrong DTSTART, DTEND, SUMMARY and RECURRENCEID
*
*
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @copyright Copyright (C) 2007-2014 Rooftop Solutions. All rights reserved.
+ * @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Issue203Test extends \Sabre\DAVServerTest {
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue205Test.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue205Test.php
index db336c806..d9998ef44 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue205Test.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue205Test.php
@@ -7,9 +7,8 @@ use Sabre\VObject;
/**
* This unittest is created to check if a VALARM TRIGGER of PT0S is supported
*
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Issue205Test extends \Sabre\DAVServerTest {
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue211Test.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue211Test.php
index 5e28c804b..d149a3984 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue211Test.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue211Test.php
@@ -7,9 +7,8 @@ use Sabre\VObject;
/**
* This unittest is created to check for an endless loop in Sabre\CalDAV\CalendarQueryValidator
*
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Issue211Test extends \Sabre\DAVServerTest {
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue220Test.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue220Test.php
index c701df544..e97cbc4a6 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue220Test.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue220Test.php
@@ -7,9 +7,8 @@ use Sabre\HTTP;
/**
* This unittest is created to check for an endless loop in CalendarQueryValidator
*
- *
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Issue220Test extends \Sabre\DAVServerTest {
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue228Test.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue228Test.php
index e8b6dfaa6..9345bdcb2 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Issue228Test.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Issue228Test.php
@@ -6,8 +6,8 @@ use Sabre\HTTP;
/**
* This unittest is created to check if the time-range filter is working correctly with all-day-events
*
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Issue228Test extends \Sabre\DAVServerTest {
diff --git a/vendor/sabre/dav/tests/Sabre/CalDAV/Schedule/IMip/Mock.php b/vendor/sabre/dav/tests/Sabre/CalDAV/Schedule/IMip/Mock.php
index 200274ce8..a97eb3bdd 100644
--- a/vendor/sabre/dav/tests/Sabre/CalDAV/Schedule/IMip/Mock.php
+++ b/vendor/sabre/dav/tests/Sabre/CalDAV/Schedule/IMip/Mock.php
@@ -12,10 +12,8 @@ namespace Sabre\CalDAV\Schedule\IMip;
* If you want to customize the email that gets sent out, you can do so by
* extending this class and overriding the sendMessage method.
*
- * @package Sabre
- * @subpackage CalDAV
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
class Mock extends \Sabre\CalDAV\Schedule\IMip {
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/URLUtilTest.php b/vendor/sabre/dav/tests/Sabre/DAV/URLUtilTest.php
index f17ca4b85..5d1380865 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/URLUtilTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/URLUtilTest.php
@@ -15,7 +15,7 @@ class URLUtilTest extends \PHPUnit_Framework_TestCase{
'%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%3a%3b%3c%3d%3e%3f'.
+ '0123456789:%3b%3c%3d%3e%3f'.
'%40ABCDEFGHIJKLMNO' .
'PQRSTUVWXYZ%5b%5c%5d%5e_' .
'%60abcdefghijklmno' .
@@ -39,7 +39,7 @@ class URLUtilTest extends \PHPUnit_Framework_TestCase{
'%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%3a%3b%3c%3d%3e%3f'.
+ '0123456789:%3b%3c%3d%3e%3f'.
'%40ABCDEFGHIJKLMNO' .
'PQRSTUVWXYZ%5b%5c%5d%5e_' .
'%60abcdefghijklmno' .
diff --git a/vendor/sabre/dav/tests/Sabre/DAVServerTest.php b/vendor/sabre/dav/tests/Sabre/DAVServerTest.php
index 5dc72fda0..a92c7065a 100644
--- a/vendor/sabre/dav/tests/Sabre/DAVServerTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAVServerTest.php
@@ -14,9 +14,8 @@ require_once 'Sabre/DAV/Auth/Backend/Mock.php';
* This class is supposed to provide a reasonably big framework to quickly get
* a testing environment running.
*
- * @package Sabre
- * @copyright Copyright (C) 2007-2013 Rooftop Solutions. All rights reserved.
- * @author Evert Pot (http://www.rooftopsolutions.nl/)
+ * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @author Evert Pot (http://evertpot.com/)
* @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
*/
abstract class DAVServerTest extends \PHPUnit_Framework_TestCase {
diff --git a/vendor/sabre/vobject/.travis.yml b/vendor/sabre/vobject/.travis.yml
index 6bf8b7592..5bd15086d 100644
--- a/vendor/sabre/vobject/.travis.yml
+++ b/vendor/sabre/vobject/.travis.yml
@@ -3,6 +3,14 @@ php:
- 5.3
- 5.4
- 5.5
+ - 5.5.9
+ - 5.5.10
+ - 5.6
+
+matrix:
+ allow_failures:
+ - php: 5.5.10
+ - php: 5.6
script: phpunit --configuration tests/phpunit.xml
diff --git a/vendor/sabre/vobject/ChangeLog b/vendor/sabre/vobject/ChangeLog
index 616c7ce26..96e1fb669 100644
--- a/vendor/sabre/vobject/ChangeLog
+++ b/vendor/sabre/vobject/ChangeLog
@@ -1,3 +1,7 @@
+2.1.4-stable (2014-03-30)
+ * Fixed: Issue #87: Several compatibility fixes related to timezone
+ handling changes in PHP 5.5.10.
+
2.1.3-stable (2013-10-02)
* Fixed: Issue #55. \r must be stripped from property values.
* Fixed: Issue #65. Putting quotes around parameter values that contain a
diff --git a/vendor/sabre/vobject/lib/Sabre/VObject/TimeZoneUtil.php b/vendor/sabre/vobject/lib/Sabre/VObject/TimeZoneUtil.php
index 6f5b69f3f..c009a6af0 100644
--- a/vendor/sabre/vobject/lib/Sabre/VObject/TimeZoneUtil.php
+++ b/vendor/sabre/vobject/lib/Sabre/VObject/TimeZoneUtil.php
@@ -298,6 +298,36 @@ class TimeZoneUtil {
'Fiji' => 'Pacific/Fiji',
'New Zealand' => 'Pacific/Auckland',
'Tonga' => 'Pacific/Tongatapu',
+
+ // PHP 5.5.10 failed on a few timezones that were valid before. We're
+ // normalizing them here.
+ 'CST6CDT' => 'America/Chicago',
+ 'Cuba' => 'America/Havana',
+ 'Egypt' => 'Africa/Cairo',
+ 'Eire' => 'Europe/Dublin',
+ 'EST5EDT' => 'America/New_York',
+ 'Factory' => 'UTC',
+ 'GB-Eire' => 'Europe/London',
+ 'GMT0' => 'UTC',
+ 'Greenwich' => 'UTC',
+ 'Hongkong' => 'Asia/Hong_Kong',
+ 'Iceland' => 'Atlantic/Reykjavik',
+ 'Iran' => 'Asia/Tehran',
+ 'Israel' => 'Asia/Jerusalem',
+ 'Jamaica' => 'America/Jamaica',
+ 'Japan' => 'Asia/Tokyo',
+ 'Kwajalein' => 'Pacific/Kwajalein',
+ 'Libya' => 'Africa/Tripoli',
+ 'MST7MDT' => 'America/Denver',
+ 'Navajo' => 'America/Denver',
+ 'NZ-CHAT' => 'Pacific/Chatham',
+ 'Poland' => 'Europe/Warsaw',
+ 'Portugal' => 'Europe/Lisbon',
+ 'PST8PDT' => 'America/Los_Angeles',
+ 'Singapore' => 'Asia/Singapore',
+ 'Turkey' => 'Europe/Istanbul',
+ 'Universal' => 'UTC',
+ 'W-SU' => 'Europe/Moscow',
);
/**
@@ -408,9 +438,21 @@ class TimeZoneUtil {
static public function getTimeZone($tzid, Component $vcalendar = null, $failIfUncertain = false) {
// First we will just see if the tzid is a support timezone identifier.
- try {
- return new \DateTimeZone($tzid);
- } catch (\Exception $e) {
+ //
+ // The only exception is if the timezone starts with (. This is to
+ // handle cases where certain microsoft products generate timezone
+ // identifiers that for instance look like:
+ //
+ // (GMT+01.00) Sarajevo/Warsaw/Zagreb
+ //
+ // Since PHP 5.5.10, the first bit will be used as the timezone and
+ // this method will return just GMT+01:00. This is wrong, because it
+ // doesn't take DST into account.
+ if ($tzid[0]!=='(') {
+ try {
+ return new \DateTimeZone($tzid);
+ } catch (\Exception $e) {
+ }
}
// Next, we check if the tzid is somewhere in our tzid map.
@@ -420,6 +462,12 @@ class TimeZoneUtil {
// Maybe the author was hyper-lazy and just included an offset. We
// support it, but we aren't happy about it.
+ //
+ // Note that the path in the source will never be taken from PHP 5.5.10
+ // onwards. PHP 5.5.10 supports the "GMT+0100" style of format, so it
+ // already gets returned early in this function. Once we drop support
+ // for versions under PHP 5.5.10, this bit can be taken out of the
+ // source.
if (preg_match('/^GMT(\+|-)([0-9]{4})$/', $tzid, $matches)) {
return new \DateTimeZone('Etc/GMT' . $matches[1] . ltrim(substr($matches[2],0,2),'0'));
}
@@ -443,10 +491,7 @@ class TimeZoneUtil {
$lic = substr($lic,8);
}
- try {
- return new \DateTimeZone($lic);
- } catch (\Exception $e) {
- }
+ return self::getTimeZone($lic, null, $failIfUncertain);
}
// Microsoft may add a magic number, which we also have an
diff --git a/vendor/sabre/vobject/lib/Sabre/VObject/Version.php b/vendor/sabre/vobject/lib/Sabre/VObject/Version.php
index 2a64140f4..5b04d0b7a 100644
--- a/vendor/sabre/vobject/lib/Sabre/VObject/Version.php
+++ b/vendor/sabre/vobject/lib/Sabre/VObject/Version.php
@@ -14,7 +14,7 @@ class Version {
/**
* Full version number
*/
- const VERSION = '2.1.3';
+ const VERSION = '2.1.4';
/**
* Stability : alpha, beta, stable
diff --git a/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorTest.php b/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorTest.php
index 1811d8b6f..5988f16e2 100644
--- a/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorTest.php
+++ b/vendor/sabre/vobject/tests/Sabre/VObject/RecurrenceIteratorTest.php
@@ -1291,7 +1291,7 @@ class RecurrenceIteratorTest extends \PHPUnit_Framework_TestCase {
}
- $tz = new DateTimeZone('GMT');
+ $tz = new DateTimeZone('UTC');
$this->assertEquals(array(
new DateTime('2012-01-07 12:00:00',$tz),
new DateTime('2012-01-08 12:00:00',$tz),
@@ -1356,7 +1356,7 @@ class RecurrenceIteratorTest extends \PHPUnit_Framework_TestCase {
}
- $tz = new DateTimeZone('GMT');
+ $tz = new DateTimeZone('UTC');
$this->assertEquals(array(
new DateTime('2012-01-12 12:00:00',$tz),
new DateTime('2012-01-13 12:00:00',$tz),
diff --git a/vendor/sabre/vobject/tests/Sabre/VObject/TimeZoneUtilTest.php b/vendor/sabre/vobject/tests/Sabre/VObject/TimeZoneUtilTest.php
index 7f76353d2..b898e8d26 100644
--- a/vendor/sabre/vobject/tests/Sabre/VObject/TimeZoneUtilTest.php
+++ b/vendor/sabre/vobject/tests/Sabre/VObject/TimeZoneUtilTest.php
@@ -144,7 +144,12 @@ HI;
function testTimezoneOffset() {
$tz = TimeZoneUtil::getTimeZone('GMT-0400', null, true);
- $ex = new \DateTimeZone('Etc/GMT-4');
+
+ if (version_compare(PHP_VERSION, '5.5.10', '>=')) {
+ $ex = new \DateTimeZone('-04:00');
+ } else {
+ $ex = new \DateTimeZone('Etc/GMT-4');
+ }
$this->assertEquals($ex->getName(), $tz->getName());
}
@@ -289,7 +294,11 @@ END:VCALENDAR
HI;
$tz = TimeZoneUtil::getTimeZone('/freeassociation.sourceforge.net/Tzfile/SystemV/EST5EDT', Reader::read($vobj), true);
- $ex = new \DateTimeZone('EST5EDT');
+ if (version_compare(PHP_VERSION, '5.5.10', '>=')) {
+ $ex = new \DateTimeZone('America/New_York');
+ } else {
+ $ex = new \DateTimeZone('EST5EDT');
+ }
$this->assertEquals($ex->getName(), $tz->getName());
}