From 580c3f4ffe9608d2beb56d418c68b3b112420e76 Mon Sep 17 00:00:00 2001
From: Mario <mario@mariovavti.com>
Date: Sun, 10 Nov 2019 12:49:51 +0000
Subject: another bulk of composer updates

(cherry picked from commit 6685381fd8db507493c3d7c1793f8c05c681bbce)
---
 .../tests/Sabre/DAV/Locks/Backend/AbstractTest.php | 55 ++++++++++------------
 .../dav/tests/Sabre/DAV/Locks/Backend/FileTest.php | 21 ++++-----
 .../tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php |  7 +--
 .../dav/tests/Sabre/DAV/Locks/Backend/PDOTest.php  | 12 ++---
 4 files changed, 44 insertions(+), 51 deletions(-)

(limited to 'vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend')

diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/AbstractTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/AbstractTest.php
index bbde69097..d1cd1799c 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/AbstractTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/AbstractTest.php
@@ -1,29 +1,31 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAV\Locks\Backend;
 
 use Sabre\DAV;
 
-abstract class AbstractTest extends \PHPUnit_Framework_TestCase {
-
+abstract class AbstractTest extends \PHPUnit\Framework\TestCase
+{
     /**
      * @abstract
+     *
      * @return AbstractBackend
      */
-    abstract function getBackend();
-
-    function testSetup() {
-
-       $backend = $this->getBackend();
-       $this->assertInstanceOf('Sabre\\DAV\\Locks\\Backend\\AbstractBackend', $backend);
+    abstract public function getBackend();
 
+    public function testSetup()
+    {
+        $backend = $this->getBackend();
+        $this->assertInstanceOf('Sabre\\DAV\\Locks\\Backend\\AbstractBackend', $backend);
     }
 
     /**
      * @depends testSetup
      */
-    function testGetLocks() {
-
+    public function testGetLocks()
+    {
         $backend = $this->getBackend();
 
         $lock = new DAV\Locks\LockInfo();
@@ -40,14 +42,13 @@ abstract class AbstractTest extends \PHPUnit_Framework_TestCase {
         $this->assertEquals(1, count($locks));
         $this->assertEquals('Sinterklaas', $locks[0]->owner);
         $this->assertEquals('someuri', $locks[0]->uri);
-
     }
 
     /**
      * @depends testGetLocks
      */
-    function testGetLocksParent() {
-
+    public function testGetLocksParent()
+    {
         $backend = $this->getBackend();
 
         $lock = new DAV\Locks\LockInfo();
@@ -64,15 +65,13 @@ abstract class AbstractTest extends \PHPUnit_Framework_TestCase {
         $this->assertEquals(1, count($locks));
         $this->assertEquals('Sinterklaas', $locks[0]->owner);
         $this->assertEquals('someuri', $locks[0]->uri);
-
     }
 
-
     /**
      * @depends testGetLocks
      */
-    function testGetLocksParentDepth0() {
-
+    public function testGetLocksParentDepth0()
+    {
         $backend = $this->getBackend();
 
         $lock = new DAV\Locks\LockInfo();
@@ -87,11 +86,10 @@ abstract class AbstractTest extends \PHPUnit_Framework_TestCase {
         $locks = $backend->getLocks('someuri/child', false);
 
         $this->assertEquals(0, count($locks));
-
     }
 
-    function testGetLocksChildren() {
-
+    public function testGetLocksChildren()
+    {
         $backend = $this->getBackend();
 
         $lock = new DAV\Locks\LockInfo();
@@ -111,14 +109,13 @@ abstract class AbstractTest extends \PHPUnit_Framework_TestCase {
 
         $locks = $backend->getLocks('someuri', true);
         $this->assertEquals(1, count($locks));
-
     }
 
     /**
      * @depends testGetLocks
      */
-    function testLockRefresh() {
-
+    public function testLockRefresh()
+    {
         $backend = $this->getBackend();
 
         $lock = new DAV\Locks\LockInfo();
@@ -139,14 +136,13 @@ abstract class AbstractTest extends \PHPUnit_Framework_TestCase {
 
         $this->assertEquals('Santa Clause', $locks[0]->owner);
         $this->assertEquals('someuri', $locks[0]->uri);
-
     }
 
     /**
      * @depends testGetLocks
      */
-    function testUnlock() {
-
+    public function testUnlock()
+    {
         $backend = $this->getBackend();
 
         $lock = new DAV\Locks\LockInfo();
@@ -164,14 +160,13 @@ abstract class AbstractTest extends \PHPUnit_Framework_TestCase {
 
         $locks = $backend->getLocks('someuri', false);
         $this->assertEquals(0, count($locks));
-
     }
 
     /**
      * @depends testUnlock
      */
-    function testUnlockUnknownToken() {
-
+    public function testUnlockUnknownToken()
+    {
         $backend = $this->getBackend();
 
         $lock = new DAV\Locks\LockInfo();
@@ -190,7 +185,5 @@ abstract class AbstractTest extends \PHPUnit_Framework_TestCase {
 
         $locks = $backend->getLocks('someuri', false);
         $this->assertEquals(1, count($locks));
-
     }
-
 }
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/FileTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/FileTest.php
index 537996f3b..50f17a7dd 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/FileTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/FileTest.php
@@ -1,24 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAV\Locks\Backend;
 
 require_once 'Sabre/TestUtil.php';
 
-class FileTest extends AbstractTest {
-
-    function getBackend() {
-
+class FileTest extends AbstractTest
+{
+    public function getBackend()
+    {
         \Sabre\TestUtil::clearTempDir();
-        $backend = new File(SABRE_TEMPDIR . '/lockdb');
-        return $backend;
+        $backend = new File(SABRE_TEMPDIR.'/lockdb');
 
+        return $backend;
     }
 
-
-    function tearDown() {
-
+    public function tearDown()
+    {
         \Sabre\TestUtil::clearTempDir();
-
     }
-
 }
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php
index 0ba02fc8b..86ffc0bb3 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOMySQLTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace Sabre\DAV\Locks\Backend;
+declare(strict_types=1);
 
-class PDOMySQLTest extends PDOTest {
+namespace Sabre\DAV\Locks\Backend;
 
+class PDOMySQLTest extends PDOTest
+{
     public $driver = 'mysql';
-
 }
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOTest.php
index a27eae93c..f5ed98f50 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Locks/Backend/PDOTest.php
@@ -1,20 +1,20 @@
 <?php
 
-namespace Sabre\DAV\Locks\Backend;
+declare(strict_types=1);
 
-abstract class PDOTest extends AbstractTest {
+namespace Sabre\DAV\Locks\Backend;
 
+abstract class PDOTest extends AbstractTest
+{
     use \Sabre\DAV\DbTestHelperTrait;
 
-    function getBackend() {
-
+    public function getBackend()
+    {
         $this->dropTables('locks');
         $this->createSchema('locks');
 
         $pdo = $this->getPDO();
 
         return new PDO($pdo);
-
     }
-
 }
-- 
cgit v1.2.3