Merge branch '4.6RC'4.6

1 files changed, 23 insertions, 25 deletions

diff --git a/vendor/sabre/dav/lib/DAV/Mount/Plugin.php b/vendor/sabre/dav/lib/DAV/Mount/Plugin.php
index dc923ad85..5eaa4d462 100644
--- a/vendor/sabre/dav/lib/DAV/Mount/Plugin.php
+++ b/vendor/sabre/dav/lib/DAV/Mount/Plugin.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAV\Mount;
 
 use Sabre\DAV;
@@ -7,7 +9,7 @@ use Sabre\HTTP\RequestInterface;
 use Sabre\HTTP\ResponseInterface;
 
 /**
- * This plugin provides support for RFC4709: Mounting WebDAV servers
+ * This plugin provides support for RFC4709: Mounting WebDAV servers.
  *
  * Simply append ?mount to any collection to generate the davmount response.
  *
@@ -15,40 +17,41 @@ use Sabre\HTTP\ResponseInterface;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Plugin extends DAV\ServerPlugin {
-
+class Plugin extends DAV\ServerPlugin
+{
     /**
-     * Reference to Server class
+     * Reference to Server class.
      *
      * @var DAV\Server
      */
     protected $server;
 
     /**
-     * Initializes the plugin and registers event handles
+     * Initializes the plugin and registers event handles.
      *
      * @param DAV\Server $server
-     * @return void
      */
-    function initialize(DAV\Server $server) {
-
+    public function initialize(DAV\Server $server)
+    {
         $this->server = $server;
         $this->server->on('method:GET', [$this, 'httpGet'], 90);
-
     }
 
     /**
      * 'beforeMethod' event handles. This event handles intercepts GET requests ending
-     * with ?mount
+     * with ?mount.
      *
-     * @param RequestInterface $request
+     * @param RequestInterface  $request
      * @param ResponseInterface $response
+     *
      * @return bool
      */
-    function httpGet(RequestInterface $request, ResponseInterface $response) {
-
+    public function httpGet(RequestInterface $request, ResponseInterface $response)
+    {
         $queryParams = $request->getQueryParameters();
-        if (!array_key_exists('mount', $queryParams)) return;
+        if (!array_key_exists('mount', $queryParams)) {
+            return;
+        }
 
         $currentUri = $request->getAbsoluteUrl();
 
@@ -59,28 +62,23 @@ class Plugin extends DAV\ServerPlugin {
 
         // Returning false to break the event chain
         return false;
-
     }
 
     /**
-     * Generates the davmount response
+     * Generates the davmount response.
      *
      * @param ResponseInterface $response
-     * @param string $uri absolute uri
-     * @return void
+     * @param string            $uri      absolute uri
      */
-    function davMount(ResponseInterface $response, $uri) {
-
+    public function davMount(ResponseInterface $response, $uri)
+    {
         $response->setStatus(200);
         $response->setHeader('Content-Type', 'application/davmount+xml');
         ob_start();
         echo '<?xml version="1.0"?>', "\n";
         echo "<dm:mount xmlns:dm=\"http://purl.org/NET/webdav/mount\">\n";
-        echo "  <dm:url>", htmlspecialchars($uri, ENT_NOQUOTES, 'UTF-8'), "</dm:url>\n";
-        echo "</dm:mount>";
+        echo '  <dm:url>', htmlspecialchars($uri, ENT_NOQUOTES, 'UTF-8'), "</dm:url>\n";
+        echo '</dm:mount>';
         $response->setBody(ob_get_clean());
-
     }
-
-
 }