[Pkg-owncloud-commits] [php-sabredav] 160/275: Merge branch '2.0'

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository php-sabredav.

commit 82b062bb7c6b19d958ba00986461742fb69cdc8a
Merge: 5f20406 bf55006
Author: Evert Pot <me at evertpot.com>
Date:   Mon Aug 18 17:34:44 2014 -0400

    Merge branch '2.0'
    
    Conflicts:
    	composer.json

 .travis.yml                                        |  1 -
 ChangeLog.md                                       |  1 +
 composer.json                                      |  2 +-
 lib/DAV/Locks/Backend/File.php                     |  9 +--
 lib/DAV/Locks/Plugin.php                           | 18 ++++++
 .../Sabre/DAV/Locks/Backend/Mock.php               | 59 +++---------------
 tests/Sabre/DAV/Locks/Plugin2Test.php              | 69 ++++++++++++++++++++++
 tests/Sabre/DAVServerTest.php                      | 16 +++++
 8 files changed, 117 insertions(+), 58 deletions(-)

diff --cc ChangeLog.md
index 2583cbf,08781d7..823aee2
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@@ -42,8 -5,8 +42,9 @@@ ChangeLo
  ------------------
  
  * #483: typo in calendars creation for PostgreSQL.
+ * #487: Locks are now automatically removed after a node has been deleted.
  
 +
  2.0.3 (2014-07-14)
  ------------------
  
diff --cc composer.json
index 1d961a3,f70ae52..e82b5e6
--- a/composer.json
+++ b/composer.json
@@@ -15,9 -15,9 +15,9 @@@
      ],
      "require": {
          "php": ">=5.4.1",
-         "sabre/vobject" : "dev-master",
+         "sabre/vobject" : "~3.3.0",
 -        "sabre/event" : "~1.0.0",
 -        "sabre/http" : "~2.0.2",
 +        "sabre/event" : "~2.0.0",
 +        "sabre/http" : "~2.0.3",
          "ext-dom": "*",
          "ext-pcre": "*",
          "ext-spl": "*",
diff --cc tests/Sabre/DAVServerTest.php
index 26d8633,6cf9530..ab6a68d
--- a/tests/Sabre/DAVServerTest.php
+++ b/tests/Sabre/DAVServerTest.php
@@@ -23,14 -23,9 +23,15 @@@ abstract class DAVServerTest extends \P
      protected $setupCardDAV = false;
      protected $setupACL = false;
      protected $setupCalDAVSharing = false;
 +    protected $setupCalDAVScheduling = false;
      protected $setupCalDAVSubscriptions = false;
+     protected $setupLocks = false;
  
 +    /**
 +     * An array with calendars. Every calendar should have
 +     *   - principaluri
 +     *   - uri
 +     */
      protected $caldavCalendars = array();
      protected $caldavCalendarObjects = array();
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git