another bulk of composer updates

(cherry picked from commit 6685381fd8db507493c3d7c1793f8c05c681bbce)

1 files changed, 29 insertions, 30 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
index 917f5ec3f..ebc1e3f7b 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
@@ -1,14 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAV\Auth\Backend;
 
 use Sabre\HTTP;
 
-class AbstractBasicTest extends \PHPUnit_Framework_TestCase {
-
-    function testCheckNoHeaders() {
-
-        $request = new HTTP\Request();
+class AbstractBasicTest extends \PHPUnit\Framework\TestCase
+{
+    public function testCheckNoHeaders()
+    {
+        $request = new HTTP\Request('GET', '/');
         $response = new HTTP\Response();
 
         $backend = new AbstractBasicMock();
@@ -16,14 +18,15 @@ class AbstractBasicTest extends \PHPUnit_Framework_TestCase {
         $this->assertFalse(
             $backend->check($request, $response)[0]
         );
-
     }
 
-    function testCheckUnknownUser() {
-
+    public function testCheckUnknownUser()
+    {
         $request = HTTP\Sapi::createFromServerArray([
+            'REQUEST_METHOD' => 'GET',
+            'REQUEST_URI' => '/',
             'PHP_AUTH_USER' => 'username',
-            'PHP_AUTH_PW'   => 'wrongpassword',
+            'PHP_AUTH_PW' => 'wrongpassword',
         ]);
         $response = new HTTP\Response();
 
@@ -32,14 +35,15 @@ class AbstractBasicTest extends \PHPUnit_Framework_TestCase {
         $this->assertFalse(
             $backend->check($request, $response)[0]
         );
-
     }
 
-    function testCheckSuccess() {
-
+    public function testCheckSuccess()
+    {
         $request = HTTP\Sapi::createFromServerArray([
+            'REQUEST_METHOD' => 'GET',
+            'REQUEST_URI' => '/',
             'PHP_AUTH_USER' => 'username',
-            'PHP_AUTH_PW'   => 'password',
+            'PHP_AUTH_PW' => 'password',
         ]);
         $response = new HTTP\Response();
 
@@ -48,44 +52,39 @@ class AbstractBasicTest extends \PHPUnit_Framework_TestCase {
             [true, 'principals/username'],
             $backend->check($request, $response)
         );
-
     }
 
-    function testRequireAuth() {
-
-        $request = new HTTP\Request();
+    public function testRequireAuth()
+    {
+        $request = new HTTP\Request('GET', '/');
         $response = new HTTP\Response();
 
         $backend = new AbstractBasicMock();
         $backend->setRealm('writing unittests on a saturday night');
         $backend->challenge($request, $response);
 
-        $this->assertContains(
-            'Basic realm="writing unittests on a saturday night"',
+        $this->assertEquals(
+            'Basic realm="writing unittests on a saturday night", charset="UTF-8"',
             $response->getHeader('WWW-Authenticate')
         );
-
     }
-
 }
 
-
-class AbstractBasicMock extends AbstractBasic {
-
+class AbstractBasicMock extends AbstractBasic
+{
     /**
-     * Validates a username and password
+     * Validates a username and password.
      *
      * This method should return true or false depending on if login
      * succeeded.
      *
      * @param string $username
      * @param string $password
+     *
      * @return bool
      */
-    function validateUserPass($username, $password) {
-
-        return ($username == 'username' && $password == 'password');
-
+    public function validateUserPass($username, $password)
+    {
+        return 'username' == $username && 'password' == $password;
     }
-
 }