Merge branch '3.0' into 3.1

Author: evert

CHANGELOG.md

@@ -1,11 +1,15 @@
 ChangeLog
 =========
 
-3.1.1 (????-??-??)
+3.1.1 (2016-01-25)
 ------------------
 
 * #755: The brower plugin and some operations would break when scheduling and
   delegation would both be enabled.
+* #757: A bunch of unittest improvements (@jakobsack).
+* The zip release ships with [sabre/vobject 4.0.1][vobj],
+  [sabre/http 4.2.1][http], [sabre/event 3.0.0][evnt],
+  [sabre/uri 1.0.1][uri] and [sabre/xml 1.3.0][xml].
 
 
 3.1.0 (2016-01-06)
@@ -71,10 +75,13 @@ ChangeLog
   [sabre/uri 1.0.1][uri] and [sabre/xml 1.1.0][xml].
 
 
-3.0.7 (????-??-??)
+3.0.7 (2016-01-12)
 ------------------
 
 * #752: PHP 7 support for 3.0 branch. (@DeepDiver1975)
+* The zip release ships with [sabre/vobject 3.5.0][vobj],
+  [sabre/http 4.2.1][http], [sabre/event 2.0.2][evnt],
+  [sabre/uri 1.0.1][uri] and [sabre/xml 1.3.0][xml].
 
 
 3.0.6 (2016-01-04)
@@ -307,6 +314,14 @@ ChangeLog
 * #193: Fix `Sabre\DAV\FSExt\Directory::getQuotaInfo()` on windows.
 
 
+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)
 ------------------
 

tests/bootstrap.php

@@ -8,6 +8,7 @@
 $autoLoader->add('Sabre\\', __DIR__);
 // VObject tests auto loading
 $autoLoader->addPsr4('Sabre\\VObject\\',__DIR__ . '/../vendor/sabre/vobject/tests/VObject');
+$autoLoader->addPsr4('Sabre\\Xml\\',__DIR__ . '/../vendor/sabre/xml/tests/Sabre/Xml');
 
 date_default_timezone_set('UTC');
 

tests/phpunit.xml

@@ -6,15 +6,22 @@
   convertWarningsToExceptions="true"
   strict="true"
   >
-  <testsuite name="sabre-vobject">
-      <directory>../vendor/sabre/vobject/tests/VObject</directory>
-  </testsuite>
   <testsuite name="sabre-event">
       <directory>../vendor/sabre/event/tests/</directory>
   </testsuite>
+  <testsuite name="sabre-uri">
+      <directory>../vendor/sabre/uri/tests/</directory>
+  </testsuite>
+  <testsuite name="sabre-xml">
+    <directory>../vendor/sabre/xml/tests/Sabre/Xml/</directory>
+  </testsuite>
   <testsuite name="sabre-http">
       <directory>../vendor/sabre/http/tests/HTTP</directory>
   </testsuite>
+  <testsuite name="sabre-vobject">
+      <directory>../vendor/sabre/vobject/tests/VObject</directory>
+  </testsuite>
+
   <testsuite name="sabre-dav">
       <directory>Sabre/DAV</directory>
   </testsuite>