From c93b3b9b044ad6d0dd23776f3635b8088ef9d4e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 19 Oct 2018 09:47:33 +0200
Subject: [PATCH 1/3] Release 3.1.5

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7ea799885..267f1213c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 ChangeLog
 =========
 
-3.1.5 (????-??-??)
+3.1.5 (2018-10-19)
 ------------------
 
 * Fixed: Creating a new calendar on some MySQL configurations caused an error.

From 5dadb5f136b6197f433058242e0e7bdff76fb068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 19 Oct 2018 10:56:49 +0200
Subject: [PATCH 2/3] Relax assert in AbstractBasicTest::testRequireAuth

---
 tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php b/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
index 7d7a598981..6e1b3416d4 100644
--- a/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
+++ b/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
@@ -61,7 +61,7 @@ function testRequireAuth() {
         $backend->setRealm('writing unittests on a saturday night');
         $backend->challenge($request, $response);
 
-        $this->assertEquals(
+        $this->assertContains(
             'Basic realm="writing unittests on a saturday night"',
             $response->getHeader('WWW-Authenticate')
         );

From b5dbb56170fd4f0d8b8b1191f22950f05d306532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 19 Oct 2018 11:05:32 +0200
Subject: [PATCH 3/3] Require phpunit <6.0.0

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index a74b2e415f..1a0963e33b 100644
--- a/composer.json
+++ b/composer.json
@@ -31,7 +31,7 @@
         "lib-libxml" : ">=2.7.0"
     },
     "require-dev" : {
-        "phpunit/phpunit" : "> 4.8, <=6.0.0",
+        "phpunit/phpunit" : "> 4.8, <6.0.0",
         "evert/phpdoc-md" : "~0.1.0"
     },
     "suggest" : {