Merge remote-tracking branch 'upstream/dev' into dev

1 files changed, 11 insertions, 19 deletions

diff --git a/vendor/sabre/vobject/lib/Writer.php b/vendor/sabre/vobject/lib/Writer.php
index f8a58758d..c70a6ae4d 100644
--- a/vendor/sabre/vobject/lib/Writer.php
+++ b/vendor/sabre/vobject/lib/Writer.php
@@ -14,8 +14,8 @@ use Sabre\Xml;
  * @author Ivan Enderlin
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Writer {
-
+class Writer
+{
     /**
      * Serializes a vCard or iCalendar object.
      *
@@ -23,24 +23,22 @@ class Writer {
      *
      * @return string
      */
-    static function write(Component $component) {
-
+    public static function write(Component $component)
+    {
         return $component->serialize();
-
     }
 
     /**
      * Serializes a jCal or jCard object.
      *
      * @param Component $component
-     * @param int $options
+     * @param int       $options
      *
      * @return string
      */
-    static function writeJson(Component $component, $options = 0) {
-
+    public static function writeJson(Component $component, $options = 0)
+    {
         return json_encode($component, $options);
-
     }
 
     /**
@@ -50,8 +48,8 @@ class Writer {
      *
      * @return string
      */
-    static function writeXml(Component $component) {
-
+    public static function writeXml(Component $component)
+    {
         $writer = new Xml\Writer();
         $writer->openMemory();
         $writer->setIndent(true);
@@ -59,15 +57,11 @@ class Writer {
         $writer->startDocument('1.0', 'utf-8');
 
         if ($component instanceof Component\VCalendar) {
-
             $writer->startElement('icalendar');
-            $writer->writeAttribute('xmlns', Parser\Xml::XCAL_NAMESPACE);
-
+            $writer->writeAttribute('xmlns', Parser\XML::XCAL_NAMESPACE);
         } else {
-
             $writer->startElement('vcards');
-            $writer->writeAttribute('xmlns', Parser\Xml::XCARD_NAMESPACE);
-
+            $writer->writeAttribute('xmlns', Parser\XML::XCARD_NAMESPACE);
         }
 
         $component->xmlSerialize($writer);
@@ -75,7 +69,5 @@ class Writer {
         $writer->endElement();
 
         return $writer->outputMemory();
-
     }
-
 }