Merge branch '4.2RC'4.2

1 files changed, 14 insertions, 17 deletions

diff --git a/vendor/sabre/vobject/lib/Reader.php b/vendor/sabre/vobject/lib/Reader.php
index 709929337..055d546a5 100644
--- a/vendor/sabre/vobject/lib/Reader.php
+++ b/vendor/sabre/vobject/lib/Reader.php
@@ -12,8 +12,8 @@ namespace Sabre\VObject;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Reader {
-
+class Reader
+{
     /**
      * If this option is passed to the reader, it will be less strict about the
      * validity of the lines.
@@ -35,18 +35,18 @@ class Reader {
      * You can either supply a string, or a readable stream for input.
      *
      * @param string|resource $data
-     * @param int $options
-     * @param string $charset
+     * @param int             $options
+     * @param string          $charset
+     *
      * @return Document
      */
-    static function read($data, $options = 0, $charset = 'UTF-8') {
-
+    public static function read($data, $options = 0, $charset = 'UTF-8')
+    {
         $parser = new Parser\MimeDir();
         $parser->setCharset($charset);
         $result = $parser->parse($data, $options);
 
         return $result;
-
     }
 
     /**
@@ -55,22 +55,21 @@ class Reader {
      * The options argument is a bitfield. Pass any of the OPTIONS constant to
      * alter the parsers' behaviour.
      *
-     * You can either a string, a readable stream, or an array for it's input.
+     * You can either a string, a readable stream, or an array for its input.
      * Specifying the array is useful if json_decode was already called on the
      * input.
      *
      * @param string|resource|array $data
-     * @param int $options
+     * @param int                   $options
      *
      * @return Document
      */
-    static function readJson($data, $options = 0) {
-
+    public static function readJson($data, $options = 0)
+    {
         $parser = new Parser\Json();
         $result = $parser->parse($data, $options);
 
         return $result;
-
     }
 
     /**
@@ -82,17 +81,15 @@ class Reader {
      * You can either supply a string, or a readable stream for input.
      *
      * @param string|resource $data
-     * @param int $options
+     * @param int             $options
      *
      * @return Document
      */
-    static function readXML($data, $options = 0) {
-
+    public static function readXML($data, $options = 0)
+    {
         $parser = new Parser\XML();
         $result = $parser->parse($data, $options);
 
         return $result;
-
     }
-
 }