Merge branch 'dev' into 'dev'

# Conflicts:
#   Zotlabs/Lib/ThreadItem.php

1 files changed, 7 insertions, 15 deletions

diff --git a/vendor/sabre/vobject/lib/ElementList.php b/vendor/sabre/vobject/lib/ElementList.php
index 959249247..56058cbd5 100644
--- a/vendor/sabre/vobject/lib/ElementList.php
+++ b/vendor/sabre/vobject/lib/ElementList.php
@@ -15,23 +15,19 @@ use LogicException;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class ElementList extends ArrayIterator {
-
-
+class ElementList extends ArrayIterator
+{
     /* {{{ ArrayAccess Interface */
 
     /**
      * Sets an item through ArrayAccess.
      *
-     * @param int $offset
+     * @param int   $offset
      * @param mixed $value
-     *
-     * @return void
      */
-    function offsetSet($offset, $value) {
-
+    public function offsetSet($offset, $value)
+    {
         throw new LogicException('You can not add new objects to an ElementList');
-
     }
 
     /**
@@ -40,15 +36,11 @@ class ElementList extends ArrayIterator {
      * This method just forwards the request to the inner iterator
      *
      * @param int $offset
-     *
-     * @return void
      */
-    function offsetUnset($offset) {
-
+    public function offsetUnset($offset)
+    {
         throw new LogicException('You can not remove objects from an ElementList');
-
     }
 
     /* }}} */
-
 }