Merge branch '5.0RC'5.0

5 files changed, 8 insertions, 18 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php
index d9af326fe..a751efdc2 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractDigestTest.php
@@ -35,11 +35,9 @@ class AbstractDigestTest extends \PHPUnit\Framework\TestCase
         );
     }
 
-    /**
-     * @expectedException \Sabre\DAV\Exception
-     */
     public function testCheckBadGetUserInfoResponse2()
     {
+        $this->expectException('Sabre\DAV\Exception');
         $header = 'username=array, realm=myRealm, nonce=12345, uri=/, response=HASH, opaque=1, qop=auth, nc=1, cnonce=1';
         $request = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'GET',
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php
index 5e34f9c49..8b874f884 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractPDOTest.php
@@ -8,7 +8,7 @@ abstract class AbstractPDOTest extends \PHPUnit\Framework\TestCase
 {
     use \Sabre\DAV\DbTestHelperTrait;
 
-    public function setUp()
+    public function setup(): void
     {
         $this->dropTables('users');
         $this->createSchema('users');
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/FileTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/FileTest.php
index 0297b17f9..31a86f9ed 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/FileTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/FileTest.php
@@ -6,7 +6,7 @@ namespace Sabre\DAV\Auth\Backend;
 
 class FileTest extends \PHPUnit\Framework\TestCase
 {
-    public function tearDown()
+    public function teardown(): void
     {
         if (file_exists(SABRE_TEMPDIR.'/filebackend')) {
             unlink(SABRE_TEMPDIR.'/filebackend');
@@ -19,11 +19,9 @@ class FileTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($file instanceof File);
     }
 
-    /**
-     * @expectedException \Sabre\DAV\Exception
-     */
     public function testLoadFileBroken()
     {
+        $this->expectException('Sabre\DAV\Exception');
         file_put_contents(SABRE_TEMPDIR.'/backend', 'user:realm:hash');
         $file = new File(SABRE_TEMPDIR.'/backend');
     }
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/Mock.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/Mock.php
index 730f2a975..fca7f722f 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/Mock.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/Mock.php
@@ -44,9 +44,6 @@ class Mock implements BackendInterface
      *
      * principals/users/[username]
      *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
-     *
      * @return array
      */
     public function check(RequestInterface $request, ResponseInterface $response)
@@ -77,9 +74,6 @@ class Mock implements BackendInterface
      * WWW-Authenticate headers may already have been set, and you'll want to
      * append your own WWW-Authenticate header instead of overwriting the
      * existing one.
-     *
-     * @param RequestInterface  $request
-     * @param ResponseInterface $response
      */
     public function challenge(RequestInterface $request, ResponseInterface $response)
     {
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/PluginTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/PluginTest.php
index 03c8a4624..f4810d524 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/PluginTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/PluginTest.php
@@ -16,7 +16,7 @@ class PluginTest extends \PHPUnit\Framework\TestCase
         $this->assertTrue($plugin instanceof Plugin);
         $fakeServer->addPlugin($plugin);
         $this->assertEquals($plugin, $fakeServer->getPlugin('auth'));
-        $this->assertInternalType('array', $plugin->getPluginInfo());
+        $this->assertIsArray($plugin->getPluginInfo());
     }
 
     /**
@@ -34,10 +34,10 @@ class PluginTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @depends testInit
-     * @expectedException \Sabre\DAV\Exception\NotAuthenticated
      */
     public function testAuthenticateFail()
     {
+        $this->expectException('Sabre\DAV\Exception\NotAuthenticated');
         $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
         $backend = new Backend\Mock();
         $backend->fail = true;
@@ -87,10 +87,10 @@ class PluginTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @depends testInit
-     * @expectedException \Sabre\DAV\Exception
      */
     public function testNoAuthBackend()
     {
+        $this->expectException('Sabre\DAV\Exception');
         $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
 
         $plugin = new Plugin();
@@ -100,10 +100,10 @@ class PluginTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @depends testInit
-     * @expectedException \Sabre\DAV\Exception
      */
     public function testInvalidCheckResponse()
     {
+        $this->expectException('Sabre\DAV\Exception');
         $fakeServer = new DAV\Server(new DAV\SimpleCollection('bla'));
         $backend = new Backend\Mock();
         $backend->invalidCheckResponse = true;