[Pkg-owncloud-commits] [php-sabredav] 02/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 65f37bd459cd5f0826fbaac4c19d257e904ca4ec
Merge: 1d1c53d 07bef42
Author: Evert Pot <me at evertpot.com>
Date:   Tue Jul 21 16:56:07 2015 -0400

    Merge branch '3.0'

 CHANGELOG.md                      | 12 ++++++++++--
 tests/Sabre/CalDAV/PluginTest.php |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --cc CHANGELOG.md
index 1d137b7,7e2793b..b9bd187
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,21 -1,7 +1,21 @@@
  ChangeLog
  =========
  
 +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],
 +  [sabre/http 4.0.0][http], [sabre/event 2.0.2][evnt],
 +  [sabre/uri 1.0.1][uri] and [sabre/xml 1.1.0][xml].
 +
 +
- 3.0.2 (2015-??-??)
+ 3.0.2 (2015-07-21)
  ------------------
  
  * #657: Migration script would break when coming a cross an iCalendar object
diff --cc tests/Sabre/CalDAV/PluginTest.php
index 126c376,0d7c705..3223f4e
--- a/tests/Sabre/CalDAV/PluginTest.php
+++ b/tests/Sabre/CalDAV/PluginTest.php
@@@ -718,10 -754,12 +718,11 @@@ XML
              '</c:filter>' .
              '</c:calendar-query>';
  
 -        $request = HTTP\Sapi::createFromServerArray(array(
 -            'REQUEST_METHOD'  => 'REPORT',
 -            'REQUEST_URI'     => '/calendars/user1/UUID-123467',
 -            'HTTP_USER_AGENT' => 'MSFT-WP/8.10.14219 (gzip)',
 -            'HTTP_DEPTH'      => '0',
 -        ));
 +        $request = new HTTP\Request('REPORT', '/calendars/user1/UUID-123467', [
 +            'Depth' => '0',
 +            'User-Agent' => 'MSFT-WP/8.10.14219 (gzip)',
 +        ]);
++
          $request->setBody($body);
  
          $this->server->httpRequest = $request;

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