Kolab Groupware OBS

php-sabre-dav.spec Changed

0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch Deleted

@@ -1,31 +0,0 @@
-diff -rupN a/tests/bootstrap.php b/tests/bootstrap.php
---- a/tests/bootstrap.php	2016-09-04 17:10:06.666787641 +0200
-+++ b/tests/bootstrap.php	2016-09-04 17:12:35.840848334 +0200
-@@ -1,17 +1,17 @@
- <?php
- 
--set_include_path(__DIR__ . '/../lib/' . PATH_SEPARATOR . __DIR__ . PATH_SEPARATOR . get_include_path());
--
--$autoLoader = include __DIR__ . '/../vendor/autoload.php';
--
--// SabreDAV tests auto loading
--$autoLoader->add('Sabre\\', __DIR__);
--// VObject tests auto loadiong
--$autoLoader->addPsr4('Sabre\\VObject\\',__DIR__ . '/../vendor/sabre/vobject/tests/VObject');
--
--
- date_default_timezone_set('UTC');
- 
-+require_once 'Symfony/Component/ClassLoader/ClassLoader.php';
-+use Symfony\Component\ClassLoader\ClassLoader;
-+$loader = new ClassLoader();
-+$loader->setUseIncludePath(true);
-+$loader->register();
-+$loader->addPrefixes(array(
-+        'Sabre' => __DIR__.'/../lib',
-+        'SabreTest' => __DIR__,
-+));
-+
- $config = [
-     'SABRE_TEMPDIR'   => dirname(__FILE__) . '/temp/',
-     'SABRE_HASSQLITE' => in_array('sqlite',PDO::getAvailableDrivers()),

0001-Use-homemade-autoload.php.patch Added

@@ -0,0 +1,202 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit@debian.org>
+Date: Thu, 26 Feb 2015 10:10:46 -0400
+Subject: Use homemade autoload.php
+
+Work around the lack of proper autoload.php from Composer.
+
+Forwarded: not-needed
+---
+ bin/build.php                  | 3 ++-
+ bin/migrateto17.php            | 6 +++---
+ bin/migrateto20.php            | 6 +++---
+ bin/migrateto21.php            | 6 +++---
+ bin/naturalselection           | 2 +-
+ bin/sabredav.php               | 4 ++--
+ examples/addressbookserver.php | 2 +-
+ examples/calendarserver.php    | 2 +-
+ examples/fileserver.php        | 2 +-
+ examples/groupwareserver.php   | 2 +-
+ examples/simplefsserver.php    | 6 +-----
+ 11 files changed, 19 insertions(+), 22 deletions(-)
+
+diff --git a/bin/build.php b/bin/build.php
+index 3ccb7e5..47c9347 100644
+--- a/bin/build.php
++++ b/bin/build.php
+@@ -1,3 +1,4 @@
++#!/usr/bin/php
+ <?php
+ 
+ $tasks = [
+@@ -77,7 +78,7 @@ function init() {
+ 
+     global $version;
+     if (!$version) {
+-        include __DIR__ . '/../vendor/autoload.php';
++        include __DIR__ . '/../lib/autoload.php';
+         $version = Sabre\DAV\Version::VERSION;
+     }
+ 
+diff --git a/bin/migrateto17.php b/bin/migrateto17.php
+index 66a9ee5..67a75e6 100755
+--- a/bin/migrateto17.php
++++ b/bin/migrateto17.php
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ 
+ echo "SabreDAV migrate script for version 1.7\n";
+@@ -36,8 +36,8 @@ HELLO;
+ // There's a bunch of places where the autoloader could be, so we'll try all of
+ // them.
+ $paths = array(
+-    __DIR__ . '/../vendor/autoload.php',
+-    __DIR__ . '/../../../autoload.php',
++    __DIR__ . '/../lib/autoload.php',
++    __DIR__ . '/../share/php/sabre21/Sabre/autoload.php',
+ );
+ 
+ foreach($paths as $path) {
+diff --git a/bin/migrateto20.php b/bin/migrateto20.php
+index e8827f4..90ce2ba 100755
+--- a/bin/migrateto20.php
++++ b/bin/migrateto20.php
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ 
+ echo "SabreDAV migrate script for version 2.0\n";
+@@ -42,8 +42,8 @@ HELLO;
+ // There's a bunch of places where the autoloader could be, so we'll try all of
+ // them.
+ $paths = [
+-    __DIR__ . '/../vendor/autoload.php',
+-    __DIR__ . '/../../../autoload.php',
++    __DIR__ . '/../lib/autoload.php',
++    __DIR__ . '/../share/php/sabre21/Sabre/autoload.php',
+ ];
+ 
+ foreach($paths as $path) {
+diff --git a/bin/migrateto21.php b/bin/migrateto21.php
+index 9a5a315..d7fc83d 100755
+--- a/bin/migrateto21.php
++++ b/bin/migrateto21.php
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ 
+ echo "SabreDAV migrate script for version 2.1\n";
+@@ -43,8 +43,8 @@ HELLO;
+ // There's a bunch of places where the autoloader could be, so we'll try all of
+ // them.
+ $paths = [
+-    __DIR__ . '/../vendor/autoload.php',
+-    __DIR__ . '/../../../autoload.php',
++    __DIR__ . '/../lib/autoload.php',
++    __DIR__ . '/../share/php/sabre21/Sabre/autoload.php',
+ ];
+ 
+ foreach($paths as $path) {
+diff --git a/bin/naturalselection b/bin/naturalselection
+index aa5554d..8ccd33b 100755
+--- a/bin/naturalselection
++++ b/bin/naturalselection
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ 
+ #
+ # Copyright (c) 2009-2010 Evert Pot
+diff --git a/bin/sabredav.php b/bin/sabredav.php
+index 34a674f..def97fd 100755
+--- a/bin/sabredav.php
++++ b/bin/sabredav.php
+@@ -28,8 +28,8 @@ if (php_sapi_name()!=='cli-server') {
+ 
+ 
+ $paths = array(
+-    __DIR__ . '/../vendor/autoload.php',
+-    __DIR__ . '/../../../autoload.php',
++    __DIR__ . '/../lib/autoload.php',
++    __DIR__ . '/autoload.php',
+ );
+ 
+ foreach($paths as $path) {
+diff --git a/examples/addressbookserver.php b/examples/addressbookserver.php
+index 4ae78f7..32cc271 100644
+--- a/examples/addressbookserver.php
++++ b/examples/addressbookserver.php
+@@ -26,7 +26,7 @@ function exception_error_handler($errno, $errstr, $errfile, $errline ) {
+ set_error_handler("exception_error_handler");
+ 
+ // Autoloader
+-require_once 'vendor/autoload.php';
++require_once 'sabre21/Sabre/autoload.php';
+ 
+ // Backends
+ $authBackend      = new Sabre\DAV\Auth\Backend\PDO($pdo);
+diff --git a/examples/calendarserver.php b/examples/calendarserver.php
+index de08a10..2a369ad 100644
+--- a/examples/calendarserver.php
++++ b/examples/calendarserver.php
+@@ -26,7 +26,7 @@ function exception_error_handler($errno, $errstr, $errfile, $errline ) {
+ set_error_handler("exception_error_handler");
+ 
+ // Files we need
+-require_once 'vendor/autoload.php';
++require_once 'sabre21/Sabre/autoload.php';
+ 
+ // Backends
+ $authBackend = new Sabre\DAV\Auth\Backend\PDO($pdo);
+diff --git a/examples/fileserver.php b/examples/fileserver.php
+index 952b550..9f9282c 100644
+--- a/examples/fileserver.php
++++ b/examples/fileserver.php
+@@ -20,7 +20,7 @@ $tmpDir = 'tmpdata';
+ 
+ 
+ // Files we need
+-require_once 'vendor/autoload.php';
++require_once 'sabre21/Sabre/autoload.php';
+ 
+ // Create the root node
+ $root = new \Sabre\DAV\FS\Directory($publicDir);
+diff --git a/examples/groupwareserver.php b/examples/groupwareserver.php
+index 668b92b..e5f2d04 100644
+--- a/examples/groupwareserver.php
++++ b/examples/groupwareserver.php
+@@ -48,7 +48,7 @@ function exception_error_handler($errno, $errstr, $errfile, $errline ) {
+ set_error_handler("exception_error_handler");
+ 
+ // Autoloader
+-require_once 'vendor/autoload.php';
++require_once 'sabre21/Sabre/autoload.php';
+ 
+ /**
+  * The backends. Yes we do really need all of them.
+diff --git a/examples/simplefsserver.php b/examples/simplefsserver.php
+index cf64730..f1c8d84 100644
+--- a/examples/simplefsserver.php
++++ b/examples/simplefsserver.php
+@@ -1,9 +1,5 @@
+ <?php
+ 
+-// !!!! Make sure the Sabre directory is in the include_path !!!
+-// example:
+-// set_include_path('lib/' . PATH_SEPARATOR . get_include_path());
+-
+ /*
+ 
+ This example demonstrates a simple way to create your own virtual filesystems.
+@@ -24,7 +20,7 @@ date_default_timezone_set('Canada/Eastern');
+ $publicDir = 'public';
+ 
+ // Files we need
+-require_once 'vendor/autoload.php';
++require_once 'sabre21/Sabre/autoload.php';

0002-Drop-Composer-autoLoader-calls.patch Added

0002-composer-required-versions.patch Deleted

0003-Increase-timeout.patch Added

0004-Install-sabredav.php-in-usr-share-php-sabre21-Sabre.patch Added

0005-tfix-threshold.patch Added

@@ -0,0 +1,84 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit@debian.org>
+Date: Thu, 26 Feb 2015 13:40:12 -0400
+Subject: tfix: threshold
+
+Forwarded: https://github.com/fruux/sabre-dav/pull/615
+Applied-Upstream: https://github.com/fruux/sabre-dav/commit/60a1e4e70e315a1098712e43e7f16b196abd0b12
+---
+ bin/naturalselection | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/bin/naturalselection b/bin/naturalselection
+index 8ccd33b..086722a 100755
+--- a/bin/naturalselection
++++ b/bin/naturalselection
+@@ -16,16 +16,16 @@ def getfreespace(path):
+     stat = os.statvfs(path)
+     return stat.f_frsize * stat.f_bavail
+ 
+-def getbytesleft(path,treshold):
+-    return getfreespace(path)-treshold
++def getbytesleft(path,threshold):
++    return getfreespace(path)-threshold
+ 
+-def run(cacheDir, treshold, sleep=5, simulate=False, min_erase = 0):
++def run(cacheDir, threshold, sleep=5, simulate=False, min_erase = 0):
+ 
+-    bytes = getbytesleft(cacheDir,treshold)
++    bytes = getbytesleft(cacheDir,threshold)
+     if (bytes>0):
+-        print "Bytes to go before we hit treshhold:", bytes
++        print "Bytes to go before we hit threshold:", bytes
+     else:
+-        print "Treshold exceeded with:", -bytes, "bytes"
++        print "Threshold exceeded with:", -bytes, "bytes"
+         dir = os.listdir(cacheDir)
+         dir2 = []
+         for file in dir:
+@@ -46,7 +46,7 @@ def run(cacheDir, treshold, sleep=5, simulate=False, min_erase = 0):
+         left = min_erase
+ 
+         # If the min_erase setting is lower than the amount of bytes over
+-        # the treshold, we use that number instead.
++        # the threshold, we use that number instead.
+         if left < -bytes :
+             left = -bytes
+ 
+@@ -73,7 +73,7 @@ def run(cacheDir, treshold, sleep=5, simulate=False, min_erase = 0):
+ def main():
+     parser = OptionParser(
+         version="naturalselecton v0.3",
+-        description="Cache directory manager. Deletes cache entries based on accesstime and free space tresholds.\n" +
++        description="Cache directory manager. Deletes cache entries based on accesstime and free space thresholds.\n" +
+             "This utility is distributed alongside SabreDAV.",
+         usage="usage: %prog [options] cacheDirectory",
+     )
+@@ -98,15 +98,15 @@ def main():
+         default=5
+     )
+     parser.add_option(
+-        '-l','--treshold',
+-        help="Treshhold in bytes (default = 10737418240, which is 10GB)",
++        '-l','--threshold',
++        help="Threshold in bytes (default = 10737418240, which is 10GB)",
+         type="int",
+-        dest="treshold",
++        dest="threshold",
+         default=10737418240
+     )
+     parser.add_option(
+         '-m', '--min-erase',
+-        help="Minimum number of bytes to erase when the treshold is reached. " +
++        help="Minimum number of bytes to erase when the threshold is reached. " +
+             "Setting this option higher will reduce the amount of times the cache directory will need to be scanned. " +
+             "(the default is 1073741824, which is 1GB.)",
+         type="int",
+@@ -130,7 +130,7 @@ def main():
+             cacheDir,
+             sleep=options.sleep,
+             simulate=options.simulate,
+-            treshold=options.treshold,
++            threshold=options.threshold,
+             min_erase=options.min_erase
+         )
+         if runs>0:

0006-tfix-selection.patch Added

0007-Rename-naturalselection-as-naturalselection21.patch Added

0008-Fix-upper-limit-after-spurious-upload-of-php-sabre-e.patch Added

0009-naturalselection.1-wfix.patch Added

debian.changelog Changed

@@ -1,61 +1,298 @@
-php-sabre-dav (2.1.6-1) unstable; urgency=low
+php-sabre-dav-2.1 (2.1.11-1) unstable; urgency=medium
+
+  * Update to version 2.1.11
+  * Updated Package to be in line with Debian Packing
+  * SabreDAV files moved to /usr/share/php/sabre21/Sabre
+  * Fixed parsing error for composer version numbers
+  * removed php_codesniffer run (problems with Ubuntu_14.04)
+  * lowered pkg-php-tools to get it work with Ubuntu_14.04
+
+ -- Daniel Hoffend <dh@dotlan.net>  Thu, 03 Dec 2016 23:26:00 +0100
+
+php-sabre-dav-2.1 (2.1.10-1) unstable; urgency=medium
+
+  [ Evert Pot ]
+  * Clean up synclog correctly after deleting addressbook.
+  * Prepping for a release
+
+  [ David Prévot ]
+  * Revert workarounds for the PHP 7.0 transition, and build with recent
+    pkg-php-tools.
+  * Move maintenance within Debian PHP PEAR Maintainers
+
+ -- David Prévot <taffit@debian.org>  Fri, 11 Mar 2016 13:45:39 -0400
+
+php-sabre-dav-2.1 (2.1.9-2) unstable; urgency=medium
+
+  * Use php-sabre-http-3 instead of php-sabre-http: that makes
+    php-sabre-dav-2.1 co-installable with more recent version of php-sabre-dav
+  * Update Standards-Version to 3.9.7
+  * Prepare php(5) build-dependencies for the PHP 7.0 transition
+  * Workaround the ongoing yet not ready PHP 7.0 transition:
+    - pkgtools called with -v triggers a segfault (#814858);
+    - add override for php(7.0)-* modules (#815988).
+
+ -- David Prévot <taffit@debian.org>  Wed, 02 Mar 2016 10:07:28 -0400
+
+php-sabre-dav-2.1 (2.1.9-1) unstable; urgency=medium
+
+  [ Thomas Müller ]
+  * Allow PHP7 in composer.json
+
+ -- David Prévot <taffit@debian.org>  Tue, 26 Jan 2016 01:25:58 -0400
+
+php-sabre-dav-2.1 (2.1.8-1) unstable; urgency=medium
+
+  [ Evert Pot ]
+  * Prepping for 2.1.8 release
+
+  [ David Prévot ]
+  * Update copyright (years)
+
+ -- David Prévot <taffit@debian.org>  Mon, 04 Jan 2016 22:48:49 -0400
+
+php-sabre-dav-2.1 (2.1.7-2) unstable; urgency=medium
+
+  * Fix upper limit after spurious upload of php-sabre-event 3.0.0~alpha1
+
+ -- David Prévot <taffit@debian.org>  Tue, 27 Oct 2015 14:58:31 -0400
+
+php-sabre-dav-2.1 (2.1.7-1) unstable; urgency=medium
+
+  [ Evert Pot ]
+  * Making the test slightly saner. Not sure exactly how a 0 length event
+  * Releasing 2.1.7
+
+  [ David Prévot ]
+  * Drop last patch, fixed upstream differently
+
+ -- David Prévot <taffit@debian.org>  Sat, 05 Sep 2015 10:20:57 -0400
+
+php-sabre-dav-2.1 (2.1.6-3) unstable; urgency=medium
 
   * Upstream Version Bump
-  * Initlal Release for Kolab Winterfell
+  * Initial Release for Kolab Winterfell
 
  -- hede <kolab983@der-he.de>  Sat, 03 Sep 2016 10:00:00 +0200
 
-php-sabredav (1.8.10-2) unstable; urgency=medium
+php-sabre-dav-2.1 (2.1.6-2) unstable; urgency=medium
 
-  * Add hint about security maintenance in Jessie
-  * Drop now useless XS-Testsuite
-  * Bump standards version to 3.9.6
-  * Revert "Prepare transition from php-horde-dav"
+  * Fix unittest for updated vobject behavior (Closes: #796423)
+
+ -- David Prévot <taffit@debian.org>  Fri, 28 Aug 2015 15:32:00 -0400
+
+php-sabre-dav-2.1 (2.1.6-1) unstable; urgency=medium
+
+  [ Evert Pot ]
+  * Backport ca91f5a to 2.1 Workaround for broken Windows Phone client.
+
+ -- David Prévot <taffit@debian.org>  Mon, 10 Aug 2015 16:29:33 +0200
+
+php-sabre-dav-2.1 (2.1.5-1) unstable; urgency=medium
+
+  [ Vincent Petry ]
+  * Properly concatenate $path, even if it's "0"
+
+ -- David Prévot <taffit@debian.org>  Sat, 11 Jul 2015 17:38:50 -0400
+
+php-sabre-dav-2.1 (2.1.4-2) unstable; urgency=medium
+
+  [ Vincent Petry ]
+  * Properly concatenate $path, even if it's "0"
+
+ -- David Prévot <taffit@debian.org>  Fri, 03 Jul 2015 15:28:00 -0400
+
+php-sabre-dav-2.1 (2.1.4-1) unstable; urgency=medium
+
+  * Rename as php-sabre-dav-2.1.
+    Install everything in its own path to be co-installable with other
+    versions of php-sabre-dav.
+
+ -- David Prévot <taffit@debian.org>  Sun, 31 May 2015 19:15:29 -0400
+
+php-sabredav (2.2.0~really2.1.4-1) experimental; urgency=medium
+
+  [ Evert Pot ]
+  * Releasing 2.1.4
+
+  [ David Prévot ]
+  * Bump pkg-php-tools version
+
+ -- David Prévot <taffit@debian.org>  Tue, 26 May 2015 22:49:54 -0400
+
+php-sabredav (2.2.0~really2.1.3-1) experimental; urgency=medium
+
+  [ Lukas Reschke ]
+  * Escape some more values
+  * Prevent enumeration of absolute path using Browser Plugin
+
+  [ David Prévot ]
+  * Track 2.1 branch
+  * Mangle version higher than 2.2.0 since alpha have already been uploaded
+  * Update copyright
+  * Provide homemade autoload.php
+  * Install naturalselection and sabredav CLIs
+  * Update uploaders list
+  * Drop copyright mention for debian/*
+
+ -- David Prévot <taffit@debian.org>  Thu, 16 Apr 2015 00:52:50 -0400
+
+php-sabredav (2.1.2-1) experimental; urgency=medium
+
+  [ Evert Pot ]
+  * Releasing 2.1.2
+
+  [ David Prévot ]
+  * Update watch file
+  * Drop now useless patch (Closes: #743111)
+
+ -- David Prévot <taffit@debian.org>  Thu, 11 Dec 2014 10:39:24 -0400
+
+php-sabredav (2.1.1-1) experimental; urgency=medium
+
+  [ Evert Pot ]
+  * calendar-timezone support for calendar-query and calendar-multiget.
+  * calendar-timezone support in free-busy-query REPORT
+  * Support for calendar-timezone in scheduling freebusy request.
+  * IScheduleObject is now also a ICalendar object.
+  * Added CalendarRoot for forward compatibility.
+  * Using class_alias instead.
+  * Only marking iCalendar objects as modified when they generate scheduling
+    messages.
+  * Support REDIRECT_REMOTE_USER.
+  * Ensuring that the sync-token field gets initialized with a value.
+  * IMipHandler did not strip mailto: frome email addresses.
+  * Adding sync-token back to the ics generator.
+  * Several issues fixed in the migration process.
+
+  [ Armin Hackmann ]
+  * #550 Don't select a shared calendar as schedule-default-calendar-URL
+
+  [ David Prévot ]
+  * Use php-symfony-class-loader instead of php-symfony-classloader
+
+ -- David Prévot <taffit@debian.org>  Fri, 28 Nov 2014 16:56:41 -0400
+
+php-sabredav (2.1.0~alpha2-1) experimental; urgency=medium
+
+  [ Evert Pot ]
+  * Adding calendar-user-address-set to default principal property search.
+  * Migrated notifications-related functionality to its own plugin.
+  * Added getCalendarObjectByUID to PDO backend.
+  * Version is alpha2
+
+ -- David Prévot <taffit@debian.org>  Wed, 29 Oct 2014 15:15:40 -0400
+
+php-sabredav (2.1.0~alpha1-1) experimental; urgency=medium
+
+  [ Evert Pot ]
+  * Providing a way to find a calendar object by its UID.
+  * Propertystorage must transfer properties after MOVE requests.
+  * Added phpcs + lots of cs fixes.
+  * Always showing the lock-token in lockdiscovery properties.

debian.control Changed

@@ -1,34 +1,36 @@
-Source: php-sabre-dav
+Source: php-sabre-dav-2.1
 Section: php
 Priority: optional
-Maintainer: ownCloud for Debian maintainers <pkg-owncloud-maintainers@lists.alioth.debian.org>
-Uploaders: Thomas Mueller <thomas.mueller@tmit.eu>,
-           Paul van Tilburg <paulvt@debian.org>,
-           David Prévot <taffit@debian.org>,
-           hede <kolab983@der-he.de>
+Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org>
+Uploaders: David Prévot <taffit@debian.org>
 Build-Depends: debhelper (>= 8.0.0),
-               php-sabre-vobject (>= 3.3.4),
-               php-sabre-vobject (< 4),
-               php-sabre-http (>= 2.0.4),
-               php-symfony-classloader,
-               php5-curl,
-               php5-sqlite,
+               help2man,
+               php-codesniffer,
+               php-curl | php5-curl,
+               php-mbstring | php5,
+               php-sabre-event,
+               php-sabre-http-3,
+               php-sabre-vobject-3,
+               php-sqlite3 | php5-sqlite,
+               phpab,
                phpunit,
-               pkg-php-tools (>= 1.7~)
-Standards-Version: 3.9.6
+               pkg-php-tools (>= 1.7~),
+               python
+Standards-Version: 3.9.7
 Homepage: http://sabre.io/dav/
-Vcs-Git: git://anonscm.debian.org/pkg-owncloud/php-sabredav.git -b 1.8
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-owncloud/php-sabredav.git
+Vcs-Git: git://anonscm.debian.org/pkg-php/php-sabredav.git -b 2.1
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-php/php-sabredav.git
 
-Package: php-sabre-dav
+Package: php-sabre-dav-2.1
 Architecture: all
 Depends: php-sabre-event (<< 3.0.0~as2.1),
-         php-sabre-http (>= 2.0.4),
-         php-sabre-vobject (>= 3.3.4),
-         php-sabre-vobject (< 4),
-         ${misc:Depends}, 
+         ${misc:Depends},
          ${phpcomposer:Debian-require}
+Recommends: python
 Suggests: ${phpcomposer:Debian-suggest}
+Replaces: ${phpcomposer:Debian-replace}
+Breaks: ${phpcomposer:Debian-conflict}, ${phpcomposer:Debian-replace}
+Provides: ${phpcomposer:Debian-provide}
 Description: ${phpcomposer:description}
  SabreDAV is meant to cover the entire standard, and attempts to allow
  integration using an easy to understand API.

debian.rules Changed

@@ -1,25 +1,55 @@
 #!/usr/bin/make -f
+
+UPSTREAM := $(shell dpkg-parsechangelog --show-field=Version | sed 's/-[^-]*//')
+
 %:
-	dh $@ --with phpcomposer
+	dh $@ --with phpcomposer -XICON-LICENSE
 
 override_dh_auto_build:
-	# resort folder structure
-	mv lib Sabre
-	mkdir -p lib
-	mv Sabre lib/
-	#forward to original dh_auto_build
 	dh_auto_build
+	phpab	--output lib/autoload.php \
+		--template debian/autoload.php.tpl \
+		lib
+	mkdir --parents vendor
+	phpab \
+		--output vendor/autoload.php \
+		--basedir vendor \
+		--template debian/autoload.php.tpl \
+		lib tests/Sabre
+	cp -a bin/sabredav bin/sabredav21
+	cp -a bin/naturalselection bin/naturalselection21
 
 override_dh_auto_clean:
-	rm -rf tests/temp
+	rm -rf tests/temp vendor
 	dh_auto_clean
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
-	cd tests && phpunit
+	phpunit --configuration tests/phpunit.xml
+	# phpcs -p --standard=tests/phpcs/ruleset.xml lib
 else
 	@echo "** tests disabled"
 endif
 
+override_dh_fixperms:
+	dh_fixperms
+	chmod -x $(CURDIR)/debian/php-sabre-dav-2.1/usr/share/php/sabre21/Sabre/sabredav.php
+
+override_dh_installman:
+	mkdir --parent $(CURDIR)/debian/tmp
+	help2man \
+		--no-info \
+		--name='keep cache directories below a specified threshold' \
+		--output=$(CURDIR)/debian/tmp/naturalselection21.1 \
+		$(CURDIR)/bin/naturalselection21
+	help2man \
+		--help-option=\  \
+		--version-string=$(UPSTREAM) \
+		--no-info \
+		--include=$(CURDIR)/debian/sabredav.1.in \
+		"echo Usage: sabredav21" \
+		> $(CURDIR)/debian/tmp/sabredav21.1
+	dh_installman
+
 get-orig-source:
 	uscan --verbose --force --rename

debian.series Changed

debian.tar.gz/autoload.php.tpl Added

debian.tar.gz/autoload.tests.php.tpl Added

debian.tar.gz/clean Added

debian.tar.gz/compat Changed

debian.tar.gz/copyright Changed

@@ -1,12 +1,11 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: sabre/dav
+Upstream-Name: sabredav
 Source: https://github.com/fruux/sabre-dav
 Upstream-Contact: SabreDAV mailinglist <sabredav-discuss@googlegroups.com>
 
 Files: *
-Copyright: 2007-2014 fruux GmbH (https://fruux.com/)
-           2007-2014 Rooftop Solutions
-License: BSD-3-clause-SabreDAV
+Copyright: 2007-2015, fruux GmbH (https://fruux.com/)
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without modification,
  are permitted provided that the following conditions are met:
  .
@@ -34,27 +33,28 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: bin/googlecode_upload.py
-Copyright: 2006, 2007 Google Inc.
+Copyright: 2006, 2007, Google Inc.
 License: Apache-2.0
  On Debian GNU/Linux system you can find the complete text of the
  Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'
 
-Files: debian/*
-Copyright: 2012 Thomas Mueller <thomas.mueller@tmit.eu>
-License: GPL-2+
- This program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the Free
- Software Foundation; either version 2 of the License, or (at your option)
- any later version.
+Files: lib/DAV/Browser/assets/openiconic/*
+Copyright: 2014, Waybury
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
  .
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- for more details.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
  .
- You should have received a copy of the GNU General Public License along
- with this package; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public License
- version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.

debian.tar.gz/examples Added

debian.tar.gz/gbp.conf Changed

debian.tar.gz/install Changed

debian.tar.gz/manpages Added

debian.tar.gz/pkg-php-tools-overrides Added

debian.tar.gz/sabredav.1.in Added

debian.tar.gz/watch Changed

php-sabre-dav.dsc Changed

@@ -1,17 +1,29 @@
 Format: 1.0
-Source: php-sabre-dav
-Binary: php-sabre-dav
+Source: php-sabre-dav-2.1
+Binary: php-sabre-dav-2.1
 Architecture: all
-Version: 2.1.6-1
+Version: 2.1.11-1
 Maintainer: Kolab for Debian testing <devel@lists.kolab.org>
 Uploaders: hede <kolab983@der-he.de>
 Homepage: http://sabre.io/dav/
-Standards-Version: 3.9.3
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-owncloud/php-sabre-dav.git
-Vcs-Git: git://anonscm.debian.org/pkg-owncloud/php-sabre-dav.git -b 2.1
-Build-Depends: debhelper (>= 8.0.0), php-sabre-vobject, php-sabre-event, php-sabre-http, php-symfony-classloader, php5-curl, php5-sqlite, phpunit, pkg-php-tools (>= 1.7~), php-sabre-vobject (>= 3.3.4), php-sabre-vobject (< 4), php-sabre-http (>= 2.0.4)
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/pkg-owncloud/php-sabredav.git -b 2.1
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-owncloud/php-sabredav.git
+Build-Depends: debhelper (>= 8.0.0),
+               help2man,
+               php-codesniffer,
+               php-curl | php5-curl,
+               php-mbstring | php5,
+               php-sabre-event,
+               php-sabre-http-3,
+               php-sabre-vobject-3,
+               php-sqlite3 | php5-sqlite,
+               phpab,
+               phpunit,
+               pkg-php-tools (>= 1.7~),
+               python
 Package-List:
- php-sabre-dav deb php optional arch=all
+ php-sabre-http-3 deb php optional arch=all
 Files:
- 00000000000000000000000000000000 0 sabre-dav-2.1.6.tar.gz
+ 00000000000000000000000000000000 0 sabre-http-3.0.5.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz

sabre-dav-2.1.6.tar.gz/.travis.yml -> sabre-dav-2.1.11.tar.gz/.travis.yml Changed

sabre-dav-2.1.6.tar.gz/ChangeLog.md -> sabre-dav-2.1.11.tar.gz/ChangeLog.md Changed

@@ -1,6 +1,51 @@
 ChangeLog
 =========
 
+2.1.11 (2016-10-06)
+-------------------
+
+* #805: It wasn't possible to create calendars that hold events, journals and
+  todos using MySQL, because the `components` column was 1 byte too small.
+* The zip release ships with [sabre/vobject 3.5.3][vobj],
+  [sabre/http 3.0.5][http], and [sabre/event 2.0.2][evnt].
+
+
+2.1.10 (2016-03-10)
+-------------------
+
+* #784: Sync logs for address books were not correctly cleaned up after
+  deleting them.
+* The zip release ships with [sabre/vobject 3.5.0][vobj],
+  [sabre/http 3.0.5][http], and [sabre/event 2.0.2][evnt].
+
+
+2.1.9 (2016-01-25)
+------------------
+
+* #674: PHP7 support (@DeepDiver1975).
+* The zip release ships with [sabre/vobject 3.5.0][vobj],
+  [sabre/http 3.0.5][http], and [sabre/event 2.0.2][evnt].
+
+
+2.1.8 (2016-01-04)
+------------------
+
+* #729: Fixed a caching problem in the Tree object.
+* #740: Bugs in `migrate20.php` script.
+* The zip release ships with [sabre/vobject 3.4.8][vobj],
+  [sabre/http 3.0.5][http], and [sabre/event 2.0.2][evnt].
+
+
+2.1.7 (2015-09-05)
+------------------
+
+* #705: A `MOVE` request that gets prevented from deleting the source resource
+  will still remove the target resource. Now all events are triggered before
+  any destructive operations.
+* The zip release ships with [sabre/vobject 3.4.7][vobj],
+  [sabre/http 3.0.5][http], and [sabre/event 2.0.2][evnt].
+
+
 2.1.6 (2015-07-21)
 ------------------
 
@@ -183,6 +228,17 @@
   [sabre/http 3.0.0][http], and [sabre/event 2.0.0][evnt].
 
 
+2.0.9 (2015-09-04)
+------------------
+
+* #705: A `MOVE` request that gets prevented from deleting the source resource
+  will still remove the target resource. Now all events are triggered before
+  any destructive operations.
+* The zip release ships with [sabre/vobject 3.4.6][vobj],
+  [sabre/http 2.0.4][http], and [sabre/event 1.0.1][evnt].
+
+
+
 2.0.8 (2015-07-11)
 ------------------

sabre-dav-2.1.6.tar.gz/LICENSE -> sabre-dav-2.1.11.tar.gz/LICENSE Changed

sabre-dav-2.1.6.tar.gz/README.md -> sabre-dav-2.1.11.tar.gz/README.md Changed

sabre-dav-2.1.6.tar.gz/bin/migrateto20.php -> sabre-dav-2.1.11.tar.gz/bin/migrateto20.php Changed

sabre-dav-2.1.6.tar.gz/composer.json -> sabre-dav-2.1.11.tar.gz/composer.json Changed

sabre-dav-2.1.6.tar.gz/examples/sql/mysql.calendars.sql -> sabre-dav-2.1.11.tar.gz/examples/sql/mysql.calendars.sql Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Backend/AbstractBackend.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Backend/AbstractBackend.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Backend/BackendInterface.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Backend/BackendInterface.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Backend/NotificationSupport.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Backend/NotificationSupport.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Backend/PDO.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Backend/PDO.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Backend/SchedulingSupport.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Backend/SchedulingSupport.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Backend/SharingSupport.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Backend/SharingSupport.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Backend/SubscriptionSupport.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Backend/SubscriptionSupport.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Backend/SyncSupport.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Backend/SyncSupport.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Calendar.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Calendar.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/CalendarHome.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/CalendarHome.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/CalendarObject.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/CalendarObject.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/CalendarQueryParser.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/CalendarQueryParser.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/CalendarQueryValidator.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/CalendarQueryValidator.php Changed

@@ -14,7 +14,7 @@
  * This is used to determine which icalendar objects should be returned for a
  * calendar-query REPORT request.
  *
- * @copyright Copyright (C) 2007-2015 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
@@ -59,7 +59,7 @@
 
         foreach($filters as $filter) {
 
-            $isDefined = isset($parent->$filter['name']);
+            $isDefined = isset($parent->{$filter['name']});
 
             if ($filter['is-not-defined']) {
 
@@ -75,7 +75,7 @@
             }
 
             if ($filter['time-range']) {
-                foreach($parent->$filter['name'] as $subComponent) {
+                foreach ($parent->{$filter['name']} as $subComponent) {
                     if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['end'])) {
                         continue 2;
                     }
@@ -89,7 +89,7 @@
 
             // If there are sub-filters, we need to find at least one component
             // for which the subfilters hold true.
-            foreach($parent->$filter['name'] as $subComponent) {
+            foreach ($parent->{$filter['name']} as $subComponent) {
 
                 if (
                     $this->validateCompFilters($subComponent, $filter['comp-filters']) &&
@@ -128,7 +128,7 @@
 
         foreach($filters as $filter) {
 
-            $isDefined = isset($parent->$filter['name']);
+            $isDefined = isset($parent->{$filter['name']});
 
             if ($filter['is-not-defined']) {
 
@@ -144,7 +144,7 @@
             }
 
             if ($filter['time-range']) {
-                foreach($parent->$filter['name'] as $subComponent) {
+                foreach ($parent->{$filter['name']} as $subComponent) {
                     if ($this->validateTimeRange($subComponent, $filter['time-range']['start'], $filter['time-range']['end'])) {
                         continue 2;
                     }
@@ -158,7 +158,7 @@
 
             // If there are sub-filters, we need to find at least one property
             // for which the subfilters hold true.
-            foreach($parent->$filter['name'] as $subComponent) {
+            foreach ($parent->{$filter['name']} as $subComponent) {
 
                 if(
                     $this->validateParamFilters($subComponent, $filter['param-filters']) &&

sabre-dav-2.1.6.tar.gz/lib/CalDAV/CalendarRoot.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/CalendarRoot.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/CalendarRootNode.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/CalendarRootNode.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Exception/InvalidComponentType.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Exception/InvalidComponentType.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/ICSExportPlugin.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/ICSExportPlugin.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/ICalendar.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/ICalendar.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/ICalendarObject.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/ICalendarObject.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/ICalendarObjectContainer.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/ICalendarObjectContainer.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/IShareableCalendar.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/IShareableCalendar.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/ISharedCalendar.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/ISharedCalendar.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Notifications/Collection.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Notifications/Collection.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Notifications/ICollection.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Notifications/ICollection.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Notifications/INode.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Notifications/INode.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Notifications/INotificationType.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Notifications/INotificationType.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Notifications/Node.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Notifications/Node.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Notifications/Notification/Invite.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Notifications/Notification/Invite.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Notifications/Notification/InviteReply.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Notifications/Notification/InviteReply.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Notifications/Notification/SystemStatus.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Notifications/Notification/SystemStatus.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Notifications/Plugin.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Notifications/Plugin.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Plugin.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Plugin.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Principal/Collection.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Principal/Collection.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Principal/IProxyRead.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Principal/IProxyRead.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Principal/IProxyWrite.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Principal/IProxyWrite.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Principal/ProxyRead.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Principal/ProxyRead.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Principal/ProxyWrite.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Principal/ProxyWrite.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Principal/User.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Principal/User.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Property/AllowedSharingModes.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Property/AllowedSharingModes.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Property/EmailAddressSet.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Property/EmailAddressSet.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Property/Invite.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Property/Invite.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Property/ScheduleCalendarTransp.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Property/ScheduleCalendarTransp.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Property/SupportedCalendarComponentSet.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Property/SupportedCalendarComponentSet.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Property/SupportedCalendarData.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Property/SupportedCalendarData.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Property/SupportedCollationSet.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Property/SupportedCollationSet.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Schedule/IInbox.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Schedule/IInbox.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Schedule/IMipPlugin.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Schedule/IMipPlugin.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Schedule/IOutbox.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Schedule/IOutbox.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Schedule/ISchedulingObject.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Schedule/ISchedulingObject.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Schedule/Inbox.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Schedule/Inbox.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Schedule/Outbox.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Schedule/Outbox.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Schedule/Plugin.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Schedule/Plugin.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Schedule/SchedulingObject.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Schedule/SchedulingObject.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/ShareableCalendar.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/ShareableCalendar.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/SharedCalendar.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/SharedCalendar.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/SharingPlugin.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/SharingPlugin.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Subscriptions/ISubscription.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Subscriptions/ISubscription.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Subscriptions/Plugin.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Subscriptions/Plugin.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/Subscriptions/Subscription.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/Subscriptions/Subscription.php Changed

sabre-dav-2.1.6.tar.gz/lib/CalDAV/UserCalendars.php -> sabre-dav-2.1.11.tar.gz/lib/CalDAV/UserCalendars.php Changed

sabre-dav-2.1.6.tar.gz/lib/CardDAV/AddressBook.php -> sabre-dav-2.1.11.tar.gz/lib/CardDAV/AddressBook.php Changed

sabre-dav-2.1.6.tar.gz/lib/CardDAV/AddressBookQueryParser.php -> sabre-dav-2.1.11.tar.gz/lib/CardDAV/AddressBookQueryParser.php Changed

sabre-dav-2.1.6.tar.gz/lib/CardDAV/AddressBookRoot.php -> sabre-dav-2.1.11.tar.gz/lib/CardDAV/AddressBookRoot.php Changed

sabre-dav-2.1.6.tar.gz/lib/CardDAV/Backend/AbstractBackend.php -> sabre-dav-2.1.11.tar.gz/lib/CardDAV/Backend/AbstractBackend.php Changed

sabre-dav-2.1.6.tar.gz/lib/CardDAV/Backend/BackendInterface.php -> sabre-dav-2.1.11.tar.gz/lib/CardDAV/Backend/BackendInterface.php Changed

sabre-dav-2.1.6.tar.gz/lib/CardDAV/Backend/PDO.php -> sabre-dav-2.1.11.tar.gz/lib/CardDAV/Backend/PDO.php Changed

sabre-dav-2.1.6.tar.gz/lib/CardDAV/Backend/SyncSupport.php -> sabre-dav-2.1.11.tar.gz/lib/CardDAV/Backend/SyncSupport.php Changed

sabre-dav-2.1.6.tar.gz/lib/CardDAV/Card.php -> sabre-dav-2.1.11.tar.gz/lib/CardDAV/Card.php Changed

sabre-dav-2.1.6.tar.gz/lib/CardDAV/IAddressBook.php -> sabre-dav-2.1.11.tar.gz/lib/CardDAV/IAddressBook.php Changed

sabre-dav-2.1.6.tar.gz/lib/CardDAV/ICard.php -> sabre-dav-2.1.11.tar.gz/lib/CardDAV/ICard.php Changed

sabre-dav-2.1.6.tar.gz/lib/CardDAV/IDirectory.php -> sabre-dav-2.1.11.tar.gz/lib/CardDAV/IDirectory.php Changed

sabre-dav-2.1.6.tar.gz/lib/CardDAV/Plugin.php -> sabre-dav-2.1.11.tar.gz/lib/CardDAV/Plugin.php Changed

sabre-dav-2.1.6.tar.gz/lib/CardDAV/Property/SupportedAddressData.php -> sabre-dav-2.1.11.tar.gz/lib/CardDAV/Property/SupportedAddressData.php Changed

sabre-dav-2.1.6.tar.gz/lib/CardDAV/Property/SupportedCollationSet.php -> sabre-dav-2.1.11.tar.gz/lib/CardDAV/Property/SupportedCollationSet.php Changed

sabre-dav-2.1.6.tar.gz/lib/CardDAV/UserAddressBooks.php -> sabre-dav-2.1.11.tar.gz/lib/CardDAV/UserAddressBooks.php Changed

sabre-dav-2.1.6.tar.gz/lib/CardDAV/VCFExportPlugin.php -> sabre-dav-2.1.11.tar.gz/lib/CardDAV/VCFExportPlugin.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Auth/Backend/AbstractBasic.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Auth/Backend/AbstractBasic.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Auth/Backend/AbstractDigest.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Auth/Backend/AbstractDigest.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Auth/Backend/Apache.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Auth/Backend/Apache.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Auth/Backend/BackendInterface.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Auth/Backend/BackendInterface.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Auth/Backend/BasicCallBack.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Auth/Backend/BasicCallBack.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Auth/Backend/File.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Auth/Backend/File.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Auth/Backend/PDO.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Auth/Backend/PDO.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Auth/Plugin.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Auth/Plugin.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Browser/GuessContentType.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Browser/GuessContentType.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Browser/MapGetToPropFind.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Browser/MapGetToPropFind.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Browser/Plugin.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Browser/Plugin.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Browser/PropFindAll.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Browser/PropFindAll.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Client.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Client.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Collection.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Collection.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/CorePlugin.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/CorePlugin.php Changed

@@ -9,7 +9,7 @@
 /**
  * The core plugin provides all the basic features for a WebDAV server.
  *
- * @copyright Copyright (C) 2007-2015 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
@@ -619,14 +619,19 @@
         if ($moveInfo['destinationExists']) {
 
             if (!$this->server->emit('beforeUnbind', [$moveInfo['destination']])) return false;
+
+        }
+        if (!$this->server->emit('beforeUnbind',[$path])) return false;
+        if (!$this->server->emit('beforeBind',[$moveInfo['destination']])) return false;
+        if (!$this->server->emit('beforeMove', [$path, $moveInfo['destination']])) return false;
+
+        if ($moveInfo['destinationExists']) {
+
             $this->server->tree->delete($moveInfo['destination']);
             $this->server->emit('afterUnbind', [$moveInfo['destination']]);
 
         }
 
-        if (!$this->server->emit('beforeUnbind', [$path])) return false;
-        if (!$this->server->emit('beforeBind', [$moveInfo['destination']])) return false;
-        if (!$this->server->emit('beforeMove', [$path, $moveInfo['destination']])) return false;
         $this->server->tree->move($path, $moveInfo['destination']);
 
         // Its important afterMove is called before afterUnbind, because it

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/BadRequest.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/BadRequest.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/Conflict.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/Conflict.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/ConflictingLock.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/ConflictingLock.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/FileNotFound.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/FileNotFound.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/Forbidden.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/Forbidden.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/InsufficientStorage.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/InsufficientStorage.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/InvalidResourceType.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/InvalidResourceType.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/InvalidSyncToken.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/InvalidSyncToken.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/LengthRequired.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/LengthRequired.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/LockTokenMatchesRequestUri.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/LockTokenMatchesRequestUri.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/Locked.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/Locked.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/MethodNotAllowed.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/MethodNotAllowed.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/NotAuthenticated.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/NotAuthenticated.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/NotFound.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/NotFound.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/NotImplemented.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/NotImplemented.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/PaymentRequired.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/PaymentRequired.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/PreconditionFailed.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/PreconditionFailed.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/ReportNotSupported.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/ReportNotSupported.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/RequestedRangeNotSatisfiable.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/RequestedRangeNotSatisfiable.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/ServiceUnavailable.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/ServiceUnavailable.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/TooManyMatches.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/TooManyMatches.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Exception/UnsupportedMediaType.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Exception/UnsupportedMediaType.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/FS/Directory.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/FS/Directory.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/FS/File.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/FS/File.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/FS/Node.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/FS/Node.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/FSExt/Directory.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/FSExt/Directory.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/FSExt/File.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/FSExt/File.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/FSExt/Node.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/FSExt/Node.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/File.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/File.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/ICollection.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/ICollection.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/IExtendedCollection.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/IExtendedCollection.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/IFile.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/IFile.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/IMoveTarget.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/IMoveTarget.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/IMultiGet.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/IMultiGet.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/INode.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/INode.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/IProperties.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/IProperties.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/IQuota.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/IQuota.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Locks/Backend/AbstractBackend.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Locks/Backend/AbstractBackend.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Locks/Backend/BackendInterface.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Locks/Backend/BackendInterface.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Locks/Backend/FS.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Locks/Backend/FS.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Locks/Backend/File.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Locks/Backend/File.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Locks/Backend/PDO.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Locks/Backend/PDO.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Locks/LockInfo.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Locks/LockInfo.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Locks/Plugin.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Locks/Plugin.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Mount/Plugin.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Mount/Plugin.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Node.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Node.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/PartialUpdate/IFile.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/PartialUpdate/IFile.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/PartialUpdate/IPatchSupport.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/PartialUpdate/IPatchSupport.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/PartialUpdate/Plugin.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/PartialUpdate/Plugin.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/PropPatch.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/PropPatch.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Property.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Property.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Property/GetLastModified.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Property/GetLastModified.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Property/Href.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Property/Href.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Property/HrefList.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Property/HrefList.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Property/IHref.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Property/IHref.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Property/LockDiscovery.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Property/LockDiscovery.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Property/ResourceType.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Property/ResourceType.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Property/Response.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Property/Response.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Property/ResponseList.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Property/ResponseList.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Property/SupportedLock.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Property/SupportedLock.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Property/SupportedMethodSet.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Property/SupportedMethodSet.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Property/SupportedReportSet.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Property/SupportedReportSet.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/PropertyInterface.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/PropertyInterface.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/PropertyStorage/Backend/BackendInterface.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/PropertyStorage/Backend/BackendInterface.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/PropertyStorage/Backend/PDO.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/PropertyStorage/Backend/PDO.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/PropertyStorage/Plugin.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/PropertyStorage/Plugin.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Server.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Server.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/ServerPlugin.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/ServerPlugin.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/SimpleCollection.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/SimpleCollection.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/SimpleFile.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/SimpleFile.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/StringUtil.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/StringUtil.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Sync/ISyncCollection.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Sync/ISyncCollection.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Sync/Plugin.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Sync/Plugin.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/TemporaryFileFilterPlugin.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/TemporaryFileFilterPlugin.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Tree.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Tree.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/URLUtil.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/URLUtil.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/UUIDUtil.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/UUIDUtil.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/Version.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/Version.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAV/XMLUtil.php -> sabre-dav-2.1.11.tar.gz/lib/DAV/XMLUtil.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/AbstractPrincipalCollection.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/AbstractPrincipalCollection.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/Exception/AceConflict.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/Exception/AceConflict.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/Exception/NeedPrivileges.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/Exception/NeedPrivileges.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/Exception/NoAbstract.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/Exception/NoAbstract.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/Exception/NotRecognizedPrincipal.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/Exception/NotRecognizedPrincipal.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/Exception/NotSupportedPrivilege.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/Exception/NotSupportedPrivilege.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/IACL.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/IACL.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/IPrincipal.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/IPrincipal.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/IPrincipalCollection.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/IPrincipalCollection.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/Plugin.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/Plugin.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/Principal.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/Principal.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/PrincipalBackend/AbstractBackend.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/PrincipalBackend/AbstractBackend.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/PrincipalBackend/BackendInterface.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/PrincipalBackend/BackendInterface.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/PrincipalBackend/PDO.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/PrincipalBackend/PDO.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/PrincipalCollection.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/PrincipalCollection.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/Property/Acl.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/Property/Acl.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/Property/AclRestrictions.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/Property/AclRestrictions.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/Property/CurrentUserPrivilegeSet.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/Property/CurrentUserPrivilegeSet.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/Property/Principal.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/Property/Principal.php Changed

sabre-dav-2.1.6.tar.gz/lib/DAVACL/Property/SupportedPrivilegeSet.php -> sabre-dav-2.1.11.tar.gz/lib/DAVACL/Property/SupportedPrivilegeSet.php Changed

sabre-dav-2.1.6.tar.gz/tests/Sabre/CalDAV/Backend/MockSubscriptionSupport.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/CalDAV/Backend/MockSubscriptionSupport.php Changed

sabre-dav-2.1.6.tar.gz/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/CalDAV/CalendarQueryValidatorTest.php Changed

sabre-dav-2.1.6.tar.gz/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php Changed

sabre-dav-2.1.6.tar.gz/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php Changed

sabre-dav-2.1.6.tar.gz/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php Changed

sabre-dav-2.1.6.tar.gz/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/CalDAV/GetEventsByTimerangeTest.php Changed

@@ -7,7 +7,7 @@
 /**
  * This unittest is created to check if queries for time-range include the start timestamp or not
  *
- * @copyright Copyright (C) 2007-2015 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
@@ -32,7 +32,7 @@
 BEGIN:VEVENT
 CREATED:20120313T142342Z
 UID:171EBEFC-C951-499D-B234-7BA7D677B45D
-DTEND;TZID=Europe/Berlin:20120227T000000
+DTEND;TZID=Europe/Berlin:20120227T010000
 TRANSP:OPAQUE
 SUMMARY:Monday 0h
 DTSTART;TZID=Europe/Berlin:20120227T000000
@@ -47,12 +47,14 @@
 
     function testQueryTimerange() {
 
-        $request = HTTP\Sapi::createFromServerArray([
-            'REQUEST_METHOD' => 'REPORT',
-            'HTTP_CONTENT_TYPE' => 'application/xml',
-            'REQUEST_URI' => '/calendars/user1/calendar1',
-            'HTTP_DEPTH' => '1',
-        ]);
+        $request = new HTTP\Request(
+            'REPORT',
+            '/calendars/user1/calendar1',
+            [
+                'Content-Type' => 'application/xml',
+                'Depth'        => '1',
+            ]
+        );
 
         $request->setBody('<?xml version="1.0" encoding="utf-8" ?>
 <C:calendar-query xmlns:D="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">

sabre-dav-2.1.6.tar.gz/tests/Sabre/CalDAV/Issue203Test.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/CalDAV/Issue203Test.php Changed

sabre-dav-2.1.6.tar.gz/tests/Sabre/CalDAV/Issue205Test.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/CalDAV/Issue205Test.php Changed

sabre-dav-2.1.6.tar.gz/tests/Sabre/CalDAV/Issue211Test.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/CalDAV/Issue211Test.php Changed

sabre-dav-2.1.6.tar.gz/tests/Sabre/CalDAV/Issue220Test.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/CalDAV/Issue220Test.php Changed

sabre-dav-2.1.6.tar.gz/tests/Sabre/CalDAV/Issue228Test.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/CalDAV/Issue228Test.php Changed

sabre-dav-2.1.6.tar.gz/tests/Sabre/CalDAV/Schedule/IMip/MockPlugin.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/CalDAV/Schedule/IMip/MockPlugin.php Changed

sabre-dav-2.1.6.tar.gz/tests/Sabre/DAV/ClientTest.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/DAV/ClientTest.php Changed

sabre-dav-2.1.6.tar.gz/tests/Sabre/DAV/HttpDeleteTest.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/DAV/HttpDeleteTest.php Changed

sabre-dav-2.1.11.tar.gz/tests/Sabre/DAV/HttpMoveTest.php Added

@@ -0,0 +1,119 @@
+<?php
+
+namespace Sabre\DAV;
+
+use Sabre\DAVServerTest;
+use Sabre\HTTP;
+
+/**
+ * Tests related to the MOVE request.
+ *
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class HttpMoveTest extends DAVServerTest {
+
+    /**
+     * Sets up the DAV tree.
+     *
+     * @return void
+     */
+    function setUpTree() {
+
+        $this->tree = new Mock\Collection('root', [
+            'file1' => 'content1',
+            'file2' => 'content2',
+        ]);
+
+    }
+
+    function testMoveToSelf() {
+
+        $request = new HTTP\Request('MOVE', '/file1', [
+            'Destination' => '/file1'
+        ]);
+        $response = $this->request($request);
+        $this->assertEquals(403, $response->getStatus());
+        $this->assertEquals('content1', $this->tree->getChild('file1')->get());
+
+    }
+
+    function testMove() {
+
+        $request = new HTTP\Request('MOVE', '/file1', [
+            'Destination' => '/file3'
+        ]);
+        $response = $this->request($request);
+        $this->assertEquals(201, $response->getStatus(), print_r($response,true));
+        $this->assertEquals('content1', $this->tree->getChild('file3')->get());
+        $this->assertFalse($this->tree->childExists('file1'));
+
+    }
+
+    function testMoveToExisting() {
+
+        $request = new HTTP\Request('MOVE', '/file1', [
+            'Destination' => '/file2'
+        ]);
+        $response = $this->request($request);
+        $this->assertEquals(204, $response->getStatus(), print_r($response,true));
+        $this->assertEquals('content1', $this->tree->getChild('file2')->get());
+        $this->assertFalse($this->tree->childExists('file1'));
+
+    }
+
+    function testMoveToExistingOverwriteT() {
+
+        $request = new HTTP\Request('MOVE', '/file1', [
+            'Destination' => '/file2',
+            'Overwrite' => 'T',
+        ]);
+        $response = $this->request($request);
+        $this->assertEquals(204, $response->getStatus(), print_r($response,true));
+        $this->assertEquals('content1', $this->tree->getChild('file2')->get());
+        $this->assertFalse($this->tree->childExists('file1'));
+
+    }
+
+    function testMoveToExistingOverwriteF() {
+
+        $request = new HTTP\Request('MOVE', '/file1', [
+            'Destination' => '/file2',
+            'Overwrite' => 'F',
+        ]);
+        $response = $this->request($request);
+        $this->assertEquals(412, $response->getStatus(), print_r($response,true));
+        $this->assertEquals('content1', $this->tree->getChild('file1')->get());
+        $this->assertEquals('content2', $this->tree->getChild('file2')->get());
+        $this->assertTrue($this->tree->childExists('file1'));
+        $this->assertTrue($this->tree->childExists('file2'));
+
+    }
+
+    /**
+     * If we MOVE to an existing file, but a plugin prevents the original from
+     * being deleted, we need to make sure that the server does not delete
+     * the destination.
+     */
+    function testMoveToExistingBlockedDeleteSource() {
+
+        $this->server->on('beforeUnbind', function($path) {
+
+            if ($path==='file1') {
+                throw new \Sabre\DAV\Exception\Forbidden('uh oh');
+            }
+
+        });
+        $request = new HTTP\Request('MOVE', '/file1', [
+            'Destination' => '/file2'
+        ]);
+        $response = $this->request($request);
+        $this->assertEquals(403, $response->getStatus(), print_r($response,true));
+        $this->assertEquals('content1', $this->tree->getChild('file1')->get());
+        $this->assertEquals('content2', $this->tree->getChild('file2')->get());
+        $this->assertTrue($this->tree->childExists('file1'));
+        $this->assertTrue($this->tree->childExists('file2'));
+
+    }
+}

sabre-dav-2.1.6.tar.gz/tests/Sabre/DAV/HttpPutTest.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/DAV/HttpPutTest.php Changed

sabre-dav-2.1.6.tar.gz/tests/Sabre/DAV/Locks/Backend/Mock.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/DAV/Locks/Backend/Mock.php Changed

sabre-dav-2.1.6.tar.gz/tests/Sabre/DAV/Mock/Collection.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/DAV/Mock/Collection.php Changed

@@ -15,7 +15,7 @@
  *   * a string, for a file
  *   * An instance of \Sabre\DAV\INode.
  *
- * @copyright Copyright (C) 2007-2015 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
@@ -35,7 +35,17 @@
     public function __construct($name, array $children = array(), Collection $parent = null) {
 
         $this->name = $name;
-        $this->children = $children;
+        foreach($children as $key=>$value) {
+            if (is_string($value)) {
+                $this->children[] = new File($key, $value, $this);
+            } elseif (is_array($value)) {
+                $this->children[] = new Collection($key, $value, $this);
+            } elseif ($value instanceof \Sabre\DAV\INode) {
+                $this->children[] = $value;
+            } else {
+                throw new \InvalidArgumentException('Unknown value passed in $children');
+            }
+        }
         $this->parent = $parent;
 
     }
@@ -82,7 +92,7 @@
         if (is_resource($data)) {
             $data = stream_get_contents($data);
         }
-        $this->children[$name] = $data;
+        $this->children[] = new File($name, $data, $this);
         return '"' . md5($data) . '"';
 
     }
@@ -95,7 +105,7 @@
      */
     public function createDirectory($name) {
 
-        $this->children[$name] = array();
+        $this->children[] = new Collection($name);
 
     }
 
@@ -106,20 +116,7 @@
      */
     public function getChildren() {
 
-        $result = array();
-        foreach($this->children as $key=>$value) {
-
-            if ($value instanceof DAV\INode) {
-                $result[] = $value;
-            } elseif (is_array($value)) {
-                $result[] = new Collection($key, $value, $this);
-            } else {
-                $result[] = new File($key, $value, $this);
-            }
-
-        }
-
-        return $result;
+        return $this->children;
 
     }
 
@@ -133,12 +130,7 @@
 
         foreach($this->children as $key=>$value) {
 
-            if ($value instanceof DAV\INode) {
-                if ($value->getName() == $name) {
-                    unset($this->children[$key]);
-                    return;
-                }
-            } elseif ($key === $name) {
+            if ($value->getName() == $name) {
                 unset($this->children[$key]);
                 return;
             }

sabre-dav-2.1.6.tar.gz/tests/Sabre/DAV/Mock/File.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/DAV/Mock/File.php Changed

@@ -9,7 +9,7 @@
  *
  * See the Collection in this directory for more details.
  *
- * @copyright Copyright (C) 2007-2015 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
@@ -48,6 +48,17 @@
     }
 
     /**
+     * Changes the name of the node.
+     *
+     * @return void
+     */
+    function setName($name) {
+
+        $this->name = $name;
+
+    }
+
+    /**
      * Updates the data
      *
      * The data argument is a readable stream resource.
@@ -91,19 +102,6 @@
     }
 
     /**
-     * Changes the name of the node.
-     *
-     * @return void
-     */
-    public function setName($newName) {
-
-        $this->parent->deleteChild($this->name);
-        $this->name = $newName;
-        $this->parent->createFile($newName, $this->contents);
-
-    }
-
-    /**
      * Returns the ETag for a file
      *
      * An ETag is a unique identifier representing the current version of the file. If the file changes, the ETag MUST change.

sabre-dav-2.1.6.tar.gz/tests/Sabre/DAV/Mock/PropertiesCollection.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/DAV/Mock/PropertiesCollection.php Changed

sabre-dav-2.1.6.tar.gz/tests/Sabre/DAV/ServerCopyMoveTest.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/DAV/ServerCopyMoveTest.php Changed

@@ -90,74 +90,6 @@
 
     }
 
-    function testMoveToSelf() {
-
-        $serverVars = array(
-            'REQUEST_URI'    => '/test.txt',
-            'REQUEST_METHOD' => 'MOVE',
-            'HTTP_DESTINATION' => '/test.txt',
-        );
-
-        $request = HTTP\Sapi::createFromServerArray($serverVars);
-        $this->server->httpRequest = ($request);
-        $this->server->exec();
-
-        $this->assertEquals(403, $this->response->status, 'Received an incorrect HTTP status. Full body inspection: ' . $this->response->body);
-        $this->assertEquals('Test contents', file_get_contents(SABRE_TEMPDIR. '/test.txt'));
-
-    }
-
-    function testMoveOverWrite() {
-
-        $serverVars = array(
-            'REQUEST_URI'    => '/test.txt',
-            'REQUEST_METHOD' => 'MOVE',
-            'HTTP_DESTINATION' => '/test2.txt',
-        );
-
-        $request = HTTP\Sapi::createFromServerArray($serverVars);
-        $this->server->httpRequest = ($request);
-        $this->server->exec();
-
-        $this->assertEquals(array(
-                'X-Sabre-Version' => [Version::VERSION],
-                'Content-Length' => [0],
-            ),
-            $this->response->getHeaders()
-         );
-
-        $this->assertEquals(204, $this->response->status);
-        $this->assertEquals('Test contents', file_get_contents(SABRE_TEMPDIR . '/test2.txt'));
-        $this->assertFalse(file_exists(SABRE_TEMPDIR . '/test.txt'), 'The sourcefile test.txt should no longer exist at this point');
-
-    }
-
-    function testBlockedOverWrite() {
-
-        $serverVars = array(
-            'REQUEST_URI'      => '/test.txt',
-            'REQUEST_METHOD'   => 'COPY',
-            'HTTP_DESTINATION' => '/test2.txt',
-            'HTTP_OVERWRITE'   => 'F',
-        );
-
-        $request = HTTP\Sapi::createFromServerArray($serverVars);
-        $this->server->httpRequest = ($request);
-        $this->server->exec();
-
-        $this->assertEquals(array(
-                'X-Sabre-Version' => [Version::VERSION],
-                'Content-Type' => ['application/xml; charset=utf-8'],
-            ),
-            $this->response->getHeaders()
-         );
-
-        $this->assertEquals(412, $this->response->status);
-        $this->assertEquals('Test contents2', file_get_contents(SABRE_TEMPDIR . '/test2.txt'));
-
-
-    }
-
     function testNonExistantParent() {
 
         $serverVars = array(

sabre-dav-2.1.6.tar.gz/tests/Sabre/DAV/Sync/MockSyncCollection.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/DAV/Sync/MockSyncCollection.php Changed

sabre-dav-2.1.6.tar.gz/tests/Sabre/DAVServerTest.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/DAVServerTest.php Changed

sabre-dav-2.1.6.tar.gz/tests/Sabre/HTTP/ResponseMock.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/HTTP/ResponseMock.php Changed

sabre-dav-2.1.6.tar.gz/tests/Sabre/HTTP/SapiMock.php -> sabre-dav-2.1.11.tar.gz/tests/Sabre/HTTP/SapiMock.php Changed

Changes of Revision 4