Merge branch '3.3' of github.com:fruux/sabre-vobject into 3.3

sabre-io · Jan 6, 2015 · d563f55 · d563f55
2 parents 684ae8a + 3b188e2
commit d563f55
Show file tree

Hide file tree

Showing 71 changed files with 135 additions and 97 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,6 +1,13 @@
 ChangeLog
 =========
 
+3.3.5 (2014-??-??)
+------------------
+
+* #168: Expanding calendars now removes objects with recurrence rules that
+  don't have a valid recurrence instance.
+
+
 3.3.4 (2014-11-19)
 ------------------
 
@@ -33,6 +40,7 @@ ChangeLog
 * Support for "Line Islands Standard Time" windows timezone.
 * #154: Correctly work around vCard parameters that have a value but no name.
 
+
 3.3.2 (2014-09-19)
 ------------------
 
@@ -54,6 +62,7 @@ ChangeLog
   declined earlier will no longer generate another reply.
 * #125: Send CANCEL messages when ORGANIZER property gets deleted.
 
+
 3.3.1 (2014-08-18)
 ------------------
 
@@ -119,6 +128,7 @@ ChangeLog
 
 3.2.1 (2014-05-03)
 ------------------
+
 * Minor tweak to make the unittests run with the latest hhvm on travis.
 * Updated timezone definitions.
 * Updated copyright links to point to http://sabre.io/
@@ -152,14 +162,9 @@ ChangeLog
   disabled and an invalid file is read.
 
 
-3.1.5 (2014-??-??)
-------------------
-* Updated: Some docblocks and other documentation. Made the unittests succeed
-  on recent php versions.
-
-
 3.1.4 (2014-03-30)
 ------------------
+
 * Fixed: Issue #87: Several compatibility fixes related to timezone handling
   changes in PHP 5.5.10.
 
@@ -342,6 +347,12 @@ ChangeLog
   add() method.
 
 
+2.1.6 (2014-12-10)
+------------------
+
+* Fixed: Minor change to make sure that unittests succeed on every PHP version.
+
+
 2.1.5 (2014-06-03)
 ------------------
 

diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/)
+Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/)
 
 All rights reserved.
 

diff --git a/lib/Cli.php b/lib/Cli.php
@@ -8,7 +8,7 @@
 /**
  * This is the CLI interface for sabre-vobject.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/Component.php b/lib/Component.php
@@ -8,7 +8,7 @@
  * A component represents a group of properties, such as VCALENDAR, VEVENT, or
  * VCARD.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/Component/VAlarm.php b/lib/Component/VAlarm.php
@@ -8,7 +8,7 @@
  *
  * This component contains some additional functionality specific for VALARMs.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/Component/VCalendar.php b/lib/Component/VCalendar.php
@@ -7,13 +7,14 @@
 use Sabre\VObject;
 use Sabre\VObject\Component;
 use Sabre\VObject\Recur\EventIterator;
+use Sabre\VObject\Recur\NoInstancesException;
 
 /**
  * The VCalendar component
  *
  * This component adds functionality to a component, specific for a VCALENDAR.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
@@ -268,12 +269,22 @@ public function expand(DateTime $start, DateTime $end, DateTimeZone $timeZone =
                 continue;
             }
 
+
+
             $uid = (string)$vevent->uid;
             if (!$uid) {
                 throw new \LogicException('Event did not have a UID!');
             }
 
-            $it = new EventIterator($this, $vevent->uid, $timeZone);
+            try {
+                $it = new EventIterator($this, $vevent->uid, $timeZone);
+            } catch (NoInstancesException $e) {
+                // This event is recurring, but it doesn't have a single
+                // instance. We are skipping this event from the output
+                // entirely.
+                unset($this->children[$key]);
+                continue;
+            }
             $it->fastForward($start);
 
             while($it->valid() && $it->getDTStart() < $end) {
@@ -286,6 +297,7 @@ public function expand(DateTime $start, DateTime $end, DateTimeZone $timeZone =
                 $it->next();
 
             }
+
             unset($this->children[$key]);
 
         }

diff --git a/lib/Component/VCard.php b/lib/Component/VCard.php
@@ -11,7 +11,7 @@
  * This component represents the BEGIN:VCARD and END:VCARD found in every
  * vcard.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
@@ -229,6 +229,15 @@ public function validate($options = 0) {
             }
 
         }
+        $uid = $this->select('UID');
+        if (($options & self::REPAIR) && count($uid) === 0) {
+            $this->UID = VObject\UUIDUtil::getUUID();
+            $warnings[] = array(
+                'level' => 1,
+                'message' => 'The UID property must appear in the VCARD component exactly 1 time',
+                'node' => $this,
+            );
+        }
         $fn = $this->select('FN');
         if (count($fn)!==1) {
 

diff --git a/lib/Component/VEvent.php b/lib/Component/VEvent.php
@@ -10,7 +10,7 @@
  *
  * This component contains some additional functionality specific for VEVENT's.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/Component/VFreeBusy.php b/lib/Component/VFreeBusy.php
@@ -10,7 +10,7 @@
  * This component adds functionality to a component, specific for VFREEBUSY
  * components.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/Component/VJournal.php b/lib/Component/VJournal.php
@@ -9,7 +9,7 @@
  *
  * This component contains some additional functionality specific for VJOURNALs.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/Component/VTimeZone.php b/lib/Component/VTimeZone.php
@@ -10,7 +10,7 @@
  * This component adds functionality to a component, specific for VTIMEZONE
  * components.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/Component/VTodo.php b/lib/Component/VTodo.php
@@ -9,7 +9,7 @@
  *
  * This component contains some additional functionality specific for VTODOs.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/DateTimeParser.php b/lib/DateTimeParser.php
@@ -14,7 +14,7 @@
  * This class is responsible for parsing the several different date and time
  * formats iCalendar and vCards have.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/Document.php b/lib/Document.php
@@ -12,7 +12,7 @@
  *
  * This class also provides a registry for document types.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/ElementList.php b/lib/ElementList.php
@@ -8,7 +8,7 @@
  * This class represents a list of elements. Lists are the result of queries,
  * such as doing $vcalendar->vevent where there's multiple VEVENT objects.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/EofException.php b/lib/EofException.php
@@ -6,7 +6,7 @@
  * Exception thrown by parser when the end of the stream has been reached,
  * before this was expected.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/FreeBusyGenerator.php b/lib/FreeBusyGenerator.php
@@ -16,7 +16,7 @@
  * VFREEBUSY components are described in RFC5545, The rules for what should
  * go in a single freebusy report is taken from RFC4791, section 7.10.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/ITip/Broker.php b/lib/ITip/Broker.php
@@ -31,7 +31,7 @@
  * 6. It can process a reply from an invite and update an events attendee
  *     status based on a reply.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/ITip/ITipException.php b/lib/ITip/ITipException.php
@@ -7,7 +7,7 @@
 /**
  * This message is emitted in case of serious problems with iTip messages.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/ITip/Message.php b/lib/ITip/Message.php
@@ -10,7 +10,7 @@
  *
  * It should for the most part be treated as immutable.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/ITip/SameOrganizerForAllComponentsException.php b/lib/ITip/SameOrganizerForAllComponentsException.php
@@ -9,7 +9,7 @@
  * component (e.g.: exceptions), but the organizer is not identical in every
  * component.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/Node.php b/lib/Node.php
@@ -5,7 +5,7 @@
 /**
  * A node is the root class for every element in an iCalendar of vCard object.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/Parameter.php b/lib/Parameter.php
@@ -13,7 +13,7 @@
  *   DTSTART;VALUE=DATE:20101108
  * VALUE=DATE would be the parameter name and value.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/ParseException.php b/lib/ParseException.php
@@ -5,7 +5,7 @@
 /**
  * Exception thrown by Reader if an invalid object was attempted to be parsed.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/Parser/Json.php b/lib/Parser/Json.php
@@ -13,7 +13,7 @@
  *
  * This parser parses both the jCal and jCard formats.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/Parser/MimeDir.php b/lib/Parser/MimeDir.php
@@ -19,7 +19,7 @@
  * Sabre\VObject\Component\VCalendar
  * Sabre\VObject\Component\VCard
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/Parser/Parser.php b/lib/Parser/Parser.php
@@ -7,7 +7,7 @@
  *
  * This class serves as a base-class for the different parsers.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/Property.php b/lib/Property.php
@@ -8,7 +8,7 @@
  * A property is always in a KEY:VALUE structure, and may optionally contain
  * parameters.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/Property/Binary.php b/lib/Property/Binary.php
@@ -16,7 +16,7 @@
  *
  * This property will transparently encode and decode to base64.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/Property/Boolean.php b/lib/Property/Boolean.php
@@ -13,7 +13,7 @@
  *
  * Automatic conversion to PHP's true and false are done.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/Property/FlatText.php b/lib/Property/FlatText.php
@@ -18,7 +18,7 @@
  * vCard 4.0 states something similar. An unescaped semi-colon _may_ be a
  * delimiter, depending on the property.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */

diff --git a/lib/Property/Float.php b/lib/Property/Float.php
@@ -11,7 +11,7 @@
  * This object represents FLOAT values. These can be 1 or more floating-point
  * numbers.
  *
- * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
+ * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */