Merge branch '4.6RC'4.6

1 files changed, 16 insertions, 19 deletions

diff --git a/vendor/sabre/xml/lib/LibXMLException.php b/vendor/sabre/xml/lib/LibXMLException.php
index f0190eb51..4701c304a 100644
--- a/vendor/sabre/xml/lib/LibXMLException.php
+++ b/vendor/sabre/xml/lib/LibXMLException.php
@@ -1,9 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Sabre\Xml;
 
-use
-    LibXMLError;
+use LibXMLError;
+use Throwable;
 
 /**
  * This exception is thrown when the Readers runs into a parsing error.
@@ -14,12 +16,12 @@ use
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class LibXMLException extends ParseException {
-
+class LibXMLException extends ParseException
+{
     /**
      * The error list.
      *
-     * @var LibXMLError[]
+     * @var []LibXMLError
      */
     protected $errors;
 
@@ -28,26 +30,21 @@ class LibXMLException extends ParseException {
      *
      * You should pass a list of LibXMLError objects in its constructor.
      *
-     * @param LibXMLError[] $errors
-     * @param int $code
-     * @param Exception $previousException
+     * @param []LibXMLError $errors
+     * @param int           $code
+     * @param Throwable     $previousException
      */
-    function __construct(array $errors, $code = null, Exception $previousException = null) {
-
+    public function __construct(array $errors, int $code = 0, Throwable $previousException = null)
+    {
         $this->errors = $errors;
-        parent::__construct($errors[0]->message . ' on line ' . $errors[0]->line . ', column ' . $errors[0]->column, $code, $previousException);
-
+        parent::__construct($errors[0]->message.' on line '.$errors[0]->line.', column '.$errors[0]->column, $code, $previousException);
     }
 
     /**
-     * Returns the LibXML errors
-     *
-     * @return void
+     * Returns the LibXML errors.
      */
-    function getErrors() {
-
+    public function getErrors(): array
+    {
         return $this->errors;
-
     }
-
 }