[Pkg-owncloud-commits] [php-sabredav] 39/40: Merge branch '3.0'

[David Prévot]

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

taffit pushed a commit to tag 3.1.0-alpha2
in repository php-sabredav.

commit 26c03918ab82ae1d5f186401b04b486b2257aa0a
Merge: c4cce26 5c2379c
Author: Evert Pot <me at evertpot.com>
Date:   Sat Sep 5 00:55:54 2015 +0200

    Merge branch '3.0'
    
    Conflicts:
    	CHANGELOG.md
    	tests/Sabre/CalDAV/GetEventsByTimerangeTest.php

 CHANGELOG.md                                    |  31 +++++-
 composer.json                                   |   4 +-
 lib/DAV/Collection.php                          |   2 +-
 lib/DAV/CorePlugin.php                          |  11 ++-
 tests/Sabre/CalDAV/GetEventsByTimerangeTest.php |  16 ++--
 tests/Sabre/DAV/HttpMoveTest.php                | 119 ++++++++++++++++++++++++
 tests/Sabre/DAV/HttpPutTest.php                 |   2 +-
 tests/Sabre/DAV/Mock/Collection.php             |  44 ++++-----
 tests/Sabre/DAV/Mock/File.php                   |  24 +++--
 tests/Sabre/DAV/Mock/PropertiesCollection.php   |  20 ++--
 tests/Sabre/DAV/Mock/StreamingFile.php          |   4 +-
 tests/Sabre/DAV/ServerCopyMoveTest.php          |  68 --------------
 12 files changed, 208 insertions(+), 137 deletions(-)

diff --cc CHANGELOG.md
index 27bfde0,7588520..082df4d
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,35 -1,7 +1,35 @@@
  ChangeLog
  =========
  
- 3.1.0-alpha2 (????-??-??)
++3.1.0-alpha2 (2015-09-05)
 +-------------------------
 +
 +* Massive calendars and addressbooks should see a big drop in peak memory
 +  usage.
 +* Fixed a privilege bug in the availability system.
 +* #697: Added a "tableName" member to the PropertyStorage PDO backend. (@Frzk).
 +* #699: PostgreSQL fix for the Locks PDO backend. (@TCKnet)
 +* Removed the `simplefsserver.php` example file. It's not simple enough.
 +* #703: PropPatch in client is not correctly encoded.
 +* #709: Throw exception when running into empty
 +  `supported-calendar-component-set`.
 +* #711: Don't trigger deserializers for empty elements in `{DAV:}prop`. This
 +  fixes issues when using sabre/dav as a client.
 +
 +
 +3.1.0-alpha1 (2015-07-19)
 +-------------------------
 +
 +* Now requires PHP 5.5
 +* Upgraded to vobject 4, which is a lot faster.
 +* Support for PHP 7.
 +* #690: Support for `calendar-availability`, draft 05.
 +  [reference][calendar-availability].
 +* #691: Workaround for broken Windows Phone client.
 +* The zip release ships with [sabre/vobject 4.0.0-alpha1][vobj],
 +
 +
- 3.0.4 (2015-??-??)
+ 3.0.4 (2015-09-06)
  ------------------
  
  * #703: PropPatch in client is not correctly encoded.
diff --cc composer.json
index a028f43,067066b..e6f27c3
--- a/composer.json
+++ b/composer.json
@@@ -14,11 -14,11 +14,11 @@@
          }
      ],
      "require": {
 -        "php": ">=5.4.1",
 -        "sabre/vobject": ">=3.3.4,<4",
 +        "php": ">=5.5.0",
 +        "sabre/vobject": ">=4.0.0-alpha1",
          "sabre/event" : "~2.0",
--        "sabre/xml"  : "~1.0",
--        "sabre/http" : "~4.0",
++        "sabre/xml"  : "~1.2",
++        "sabre/http" : "~4.1",
          "sabre/uri" : "~1.0",
          "ext-dom": "*",
          "ext-pcre": "*",

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