Merge branch '2.6RC'2.6

3 files changed, 14 insertions, 14 deletions

diff --git a/vendor/sabre/vobject/lib/Parser/Json.php b/vendor/sabre/vobject/lib/Parser/Json.php
index 370c981a8..a77258a2e 100644
--- a/vendor/sabre/vobject/lib/Parser/Json.php
+++ b/vendor/sabre/vobject/lib/Parser/Json.php
@@ -4,8 +4,8 @@ namespace Sabre\VObject\Parser;
 
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Component\VCard;
-use Sabre\VObject\ParseException;
 use Sabre\VObject\EofException;
+use Sabre\VObject\ParseException;
 
 /**
  * Json Parser.
diff --git a/vendor/sabre/vobject/lib/Parser/MimeDir.php b/vendor/sabre/vobject/lib/Parser/MimeDir.php
index 6a7f9317b..fa75a1a3b 100644
--- a/vendor/sabre/vobject/lib/Parser/MimeDir.php
+++ b/vendor/sabre/vobject/lib/Parser/MimeDir.php
@@ -2,12 +2,12 @@
 
 namespace Sabre\VObject\Parser;
 
-use Sabre\VObject\ParseException;
-use Sabre\VObject\EofException;
 use Sabre\VObject\Component;
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Component\VCard;
 use Sabre\VObject\Document;
+use Sabre\VObject\EofException;
+use Sabre\VObject\ParseException;
 
 /**
  * MimeDir parser.
diff --git a/vendor/sabre/vobject/lib/Parser/XML.php b/vendor/sabre/vobject/lib/Parser/XML.php
index 060a7fe2e..5ac423984 100644
--- a/vendor/sabre/vobject/lib/Parser/XML.php
+++ b/vendor/sabre/vobject/lib/Parser/XML.php
@@ -20,7 +20,7 @@ use Sabre\Xml as SabreXml;
  */
 class XML extends Parser {
 
-    const XCAL_NAMESPACE  = 'urn:ietf:params:xml:ns:icalendar-2.0';
+    const XCAL_NAMESPACE = 'urn:ietf:params:xml:ns:icalendar-2.0';
     const XCARD_NAMESPACE = 'urn:ietf:params:xml:ns:vcard-4.0';
 
     /**
@@ -100,7 +100,7 @@ class XML extends Parser {
                 foreach ($this->input['value'] as &$vCard) {
 
                     $this->root = new VCard(['version' => '4.0'], false);
-                    $this->pointer  = &$vCard;
+                    $this->pointer = &$vCard;
                     $this->parseVCardComponents($this->root);
 
                     // We just parse the first <vcard /> element.
@@ -172,10 +172,10 @@ class XML extends Parser {
 
             list($namespace, $tagName) = SabreXml\Service::parseClarkNotation($xmlProperty['name']);
 
-            $propertyName       = $tagName;
-            $propertyValue      = [];
+            $propertyName = $tagName;
+            $propertyValue = [];
             $propertyParameters = [];
-            $propertyType       = 'text';
+            $propertyType = 'text';
 
             // A property which is not part of the standard.
             if ($namespace !== self::XCAL_NAMESPACE
@@ -253,8 +253,8 @@ class XML extends Parser {
             switch ($propertyNameExtended) {
 
                 case 'xcal:geo':
-                    $propertyType               = 'float';
-                    $propertyValue['latitude']  = 0;
+                    $propertyType = 'float';
+                    $propertyValue['latitude'] = 0;
                     $propertyValue['longitude'] = 0;
 
                     foreach ($xmlProperty['value'] as $xmlRequestChild) {
@@ -296,7 +296,7 @@ class XML extends Parser {
                         if ('period' === $tagName) {
 
                             $propertyParameters['value'] = 'PERIOD';
-                            $propertyValue[]             = implode('/', $specialChild['value']);
+                            $propertyValue[] = implode('/', $specialChild['value']);
 
                         }
                         else {
@@ -306,7 +306,7 @@ class XML extends Parser {
                     break;
 
                 default:
-                    $propertyType  = static::getTagName($xmlProperty['value'][0]['name']);
+                    $propertyType = static::getTagName($xmlProperty['value'][0]['name']);
 
                     foreach ($xmlProperty['value'] as $value) {
                         $propertyValue[] = $value['value'];
@@ -343,7 +343,7 @@ class XML extends Parser {
 
         foreach ($components as $component) {
 
-            $componentName    = static::getTagName($component['name']);
+            $componentName = static::getTagName($component['name']);
             $currentComponent = $this->root->createComponent(
                 $componentName,
                 null,
@@ -404,7 +404,7 @@ class XML extends Parser {
             $reader->elementMap['{' . self::XCAL_NAMESPACE . '}recur']
                 = 'Sabre\VObject\Parser\XML\Element\KeyValue';
             $reader->xml($input);
-            $input  = $reader->parse();
+            $input = $reader->parse();
 
         }