1 files changed, 29 insertions, 39 deletions

diff --git a/vendor/sabre/dav/tests/Sabre/DAV/ServerEventsTest.php b/vendor/sabre/dav/tests/Sabre/DAV/ServerEventsTest.php
index 42759647a..7d55ea02e 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/ServerEventsTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/ServerEventsTest.php
@@ -1,36 +1,36 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAV;
 
 use Sabre\HTTP;
 
 require_once 'Sabre/DAV/AbstractServer.php';
 
-class ServerEventsTest extends AbstractServer {
-
+class ServerEventsTest extends AbstractServer
+{
     private $tempPath;
 
     private $exception;
 
-    function testAfterBind() {
-
+    public function testAfterBind()
+    {
         $this->server->on('afterBind', [$this, 'afterBindHandler']);
         $newPath = 'afterBind';
 
         $this->tempPath = '';
         $this->server->createFile($newPath, 'body');
         $this->assertEquals($newPath, $this->tempPath);
-
     }
 
-    function afterBindHandler($path) {
-
-       $this->tempPath = $path;
-
+    public function afterBindHandler($path)
+    {
+        $this->tempPath = $path;
     }
 
-    function testAfterResponse() {
-
+    public function testAfterResponse()
+    {
         $mock = $this->getMockBuilder('stdClass')
             ->setMethods(['afterResponseCallback'])
             ->getMock();
@@ -40,74 +40,65 @@ class ServerEventsTest extends AbstractServer {
 
         $this->server->httpRequest = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'GET',
-            'REQUEST_URI'    => '/test.txt',
+            'REQUEST_URI' => '/test.txt',
         ]);
 
         $this->server->exec();
-
     }
 
-    function testBeforeBindCancel() {
-
+    public function testBeforeBindCancel()
+    {
         $this->server->on('beforeBind', [$this, 'beforeBindCancelHandler']);
         $this->assertFalse($this->server->createFile('bla', 'body'));
 
         // Also testing put()
         $req = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'PUT',
-            'REQUEST_URI'    => '/barbar',
+            'REQUEST_URI' => '/barbar',
         ]);
 
         $this->server->httpRequest = $req;
         $this->server->exec();
 
         $this->assertEquals(500, $this->server->httpResponse->getStatus());
-
     }
 
-    function beforeBindCancelHandler($path) {
-
+    public function beforeBindCancelHandler($path)
+    {
         return false;
-
     }
 
-    function testException() {
-
+    public function testException()
+    {
         $this->server->on('exception', [$this, 'exceptionHandler']);
 
         $req = HTTP\Sapi::createFromServerArray([
             'REQUEST_METHOD' => 'GET',
-            'REQUEST_URI'    => '/not/exisitng',
+            'REQUEST_URI' => '/not/exisitng',
         ]);
         $this->server->httpRequest = $req;
         $this->server->exec();
 
         $this->assertInstanceOf('Sabre\\DAV\\Exception\\NotFound', $this->exception);
-
     }
 
-    function exceptionHandler(Exception $exception) {
-
+    public function exceptionHandler(Exception $exception)
+    {
         $this->exception = $exception;
-
     }
 
-    function testMethod() {
-
+    public function testMethod()
+    {
         $k = 1;
-        $this->server->on('method', function($request, $response) use (&$k) {
-
-            $k += 1;
+        $this->server->on('method:*', function ($request, $response) use (&$k) {
+            ++$k;
 
             return false;
-
         });
-        $this->server->on('method', function($request, $response) use (&$k) {
-
+        $this->server->on('method:*', function ($request, $response) use (&$k) {
             $k += 2;
 
             return false;
-
         });
 
         try {
@@ -116,11 +107,10 @@ class ServerEventsTest extends AbstractServer {
                 new HTTP\Response(),
                 false
             );
-        } catch (Exception $e) {}
+        } catch (Exception $e) {
+        }
 
         // Fun fact, PHP 7.1 changes the order when sorting-by-callback.
         $this->assertTrue($k >= 2 && $k <= 3);
-
     }
-
 }