Merge branch '4.6RC'4.6

1 files changed, 18 insertions, 19 deletions

diff --git a/vendor/sabre/dav/lib/DAV/Exception/Locked.php b/vendor/sabre/dav/lib/DAV/Exception/Locked.php
index 8176db46e..632bafc60 100644
--- a/vendor/sabre/dav/lib/DAV/Exception/Locked.php
+++ b/vendor/sabre/dav/lib/DAV/Exception/Locked.php
@@ -1,11 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\DAV\Exception;
 
 use Sabre\DAV;
 
 /**
- * Locked
+ * Locked.
  *
  * The 423 is thrown when a client tried to access a resource that was locked, without supplying a valid lock token
  *
@@ -13,49 +15,48 @@ use Sabre\DAV;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Locked extends DAV\Exception {
-
+class Locked extends DAV\Exception
+{
     /**
-     * Lock information
+     * Lock information.
      *
-     * @var Sabre\DAV\Locks\LockInfo
+     * @var \Sabre\DAV\Locks\LockInfo
      */
     protected $lock;
 
     /**
-     * Creates the exception
+     * Creates the exception.
      *
      * A LockInfo object should be passed if the user should be informed
      * which lock actually has the file locked.
      *
      * @param DAV\Locks\LockInfo $lock
      */
-    function __construct(DAV\Locks\LockInfo $lock = null) {
+    public function __construct(DAV\Locks\LockInfo $lock = null)
+    {
+        parent::__construct();
 
         $this->lock = $lock;
-
     }
 
     /**
-     * Returns the HTTP statuscode for this exception
+     * Returns the HTTP statuscode for this exception.
      *
      * @return int
      */
-    function getHTTPCode() {
-
+    public function getHTTPCode()
+    {
         return 423;
-
     }
 
     /**
-     * This method allows the exception to include additional information into the WebDAV error response
+     * This method allows the exception to include additional information into the WebDAV error response.
      *
-     * @param DAV\Server $server
+     * @param DAV\Server  $server
      * @param \DOMElement $errorNode
-     * @return void
      */
-    function serialize(DAV\Server $server, \DOMElement $errorNode) {
-
+    public function serialize(DAV\Server $server, \DOMElement $errorNode)
+    {
         if ($this->lock) {
             $error = $errorNode->ownerDocument->createElementNS('DAV:', 'd:lock-token-submitted');
             $errorNode->appendChild($error);
@@ -66,7 +67,5 @@ class Locked extends DAV\Exception {
                 $href
             );
         }
-
     }
-
 }