Merge branch 'dev' into 'dev'

# Conflicts:
#   Zotlabs/Lib/ThreadItem.php

1 files changed, 9 insertions, 13 deletions

diff --git a/vendor/sabre/vobject/lib/Splitter/VCard.php b/vendor/sabre/vobject/lib/Splitter/VCard.php
index 0bb82abe9..a20f5c2c1 100644
--- a/vendor/sabre/vobject/lib/Splitter/VCard.php
+++ b/vendor/sabre/vobject/lib/Splitter/VCard.php
@@ -19,8 +19,8 @@ use Sabre\VObject\Parser\MimeDir;
  * @author Armin Hackmann
  * @license http://sabre.io/license/ Modified BSD License
  */
-class VCard implements SplitterInterface {
-
+class VCard implements SplitterInterface
+{
     /**
      * File handle.
      *
@@ -38,16 +38,15 @@ class VCard implements SplitterInterface {
     /**
      * Constructor.
      *
-     * The splitter should receive an readable file stream as it's input.
+     * The splitter should receive an readable file stream as its input.
      *
      * @param resource $input
-     * @param int $options Parser options, see the OPTIONS constants.
+     * @param int      $options parser options, see the OPTIONS constants
      */
-    function __construct($input, $options = 0) {
-
+    public function __construct($input, $options = 0)
+    {
         $this->input = $input;
         $this->parser = new MimeDir($input, $options);
-
     }
 
     /**
@@ -56,23 +55,20 @@ class VCard implements SplitterInterface {
      *
      * When the end is reached, null will be returned.
      *
-     * @return Sabre\VObject\Component|null
+     * @return \Sabre\VObject\Component|null
      */
-    function getNext() {
-
+    public function getNext()
+    {
         try {
             $object = $this->parser->parse();
 
             if (!$object instanceof VObject\Component\VCard) {
                 throw new VObject\ParseException('The supplied input contained non-VCARD data.');
             }
-
         } catch (VObject\EofException $e) {
             return;
         }
 
         return $object;
-
     }
-
 }