[Pkg-owncloud-commits] [php-sabredav] 05/16: Merge pull request #714 from fruux/prevent-delete-on-forbidden-move

[David Prévot]

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

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

commit 94c2f8597e52416627307c714ef7a335399b180b
Merge: 4eff5d4 67632c4
Author: Evert Pot <me at evertpot.com>
Date:   Fri Sep 4 16:22:25 2015 +0200

    Merge pull request #714 from fruux/prevent-delete-on-forbidden-move
    
    Prevent delete on forbidden move

 lib/DAV/Collection.php                 |   2 +-
 lib/DAV/CorePlugin.php                 |   9 ++-
 tests/Sabre/DAV/HttpMoveTest.php       | 119 +++++++++++++++++++++++++++++++++
 tests/Sabre/DAV/HttpPutTest.php        |   2 +-
 tests/Sabre/DAV/Mock/Collection.php    |  38 +++++------
 tests/Sabre/DAV/Mock/File.php          |   6 ++
 tests/Sabre/DAV/ServerCopyMoveTest.php |  66 ------------------
 7 files changed, 149 insertions(+), 93 deletions(-)

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