Kolab Groupware OBS

php-sabre-vobject.spec Changed

0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch Deleted

0001-Use-homemade-autoloader.php.patch Added

@@ -0,0 +1,129 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit@debian.org>
+Date: Tue, 24 Feb 2015 15:37:47 -0400
+Subject: Use homemade autoloader.php
+
+Work around the lack of proper autoload.php from Composer.
+
+Forwarded: not-needed
+---
+ bin/bench.php                 | 4 ++--
+ bin/fetch_windows_zones.php   | 2 +-
+ bin/generate_vcards           | 6 +++---
+ bin/generateicalendardata.php | 4 ++--
+ bin/rrulebench.php            | 2 +-
+ bin/vobject                   | 6 +++---
+ tests/bootstrap.php           | 4 ++--
+ 7 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/bin/bench.php b/bin/bench.php
+index b949c8e..970b7d9 100755
+--- a/bin/bench.php
++++ b/bin/bench.php
+@@ -1,7 +1,7 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ 
+-include __DIR__ . '/../vendor/autoload.php';
++include __DIR__ . '/../lib/autoload.php';
+ 
+ $data = stream_get_contents(STDIN);
+ 
+diff --git a/bin/fetch_windows_zones.php b/bin/fetch_windows_zones.php
+index a577c52..f258597 100755
+--- a/bin/fetch_windows_zones.php
++++ b/bin/fetch_windows_zones.php
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ 
+ $windowsZonesUrl = 'http://unicode.org/repos/cldr/trunk/common/supplemental/windowsZones.xml';
+diff --git a/bin/generate_vcards b/bin/generate_vcards
+index 638f63b..bca36db 100755
+--- a/bin/generate_vcards
++++ b/bin/generate_vcards
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ 
+ namespace Sabre\VObject;
+@@ -6,8 +6,8 @@ namespace Sabre\VObject;
+ // This sucks.. we have to try to find the composer autoloader. But chances
+ // are, we can't find it this way. So we'll do our bestest
+ $paths = array(
+-    __DIR__ . '/../vendor/autoload.php',  // In case vobject is cloned directly
+-    __DIR__ . '/../../../autoload.php',   // In case vobject is a composer dependency.
++    __DIR__ . '/../lib/autoload.php',			  // In case vobject is used from the package tree
++    __DIR__ . '/../share/php/sabre21/Sabre/VObject/autoload.php', // In case vobject is used from the system path.
+ );
+ 
+ foreach($paths as $path) {
+diff --git a/bin/generateicalendardata.php b/bin/generateicalendardata.php
+index 92c8c10..070362e 100755
+--- a/bin/generateicalendardata.php
++++ b/bin/generateicalendardata.php
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ 
+ use Sabre\VObject;
+@@ -25,7 +25,7 @@ $events = 100;
+ 
+ if (isset($argv1)) $events = (int)$argv1;
+ 
+-include __DIR__ . '/../vendor/autoload.php';
++include __DIR__ . '/../lib/autoload.php';
+ 
+ fwrite(STDERR, "Generating " . $events . " events\n");
+ 
+diff --git a/bin/rrulebench.php b/bin/rrulebench.php
+index f151819..6f262e7 100644
+--- a/bin/rrulebench.php
++++ b/bin/rrulebench.php
+@@ -1,6 +1,6 @@
+ <?php
+ 
+-include __DIR__ . '/../vendor/autoload.php';
++include __DIR__ . '/../lib/autoload.php';
+ 
+ if ($argc < 4) {
+     echo "sabre/vobject ", Sabre\VObject\Version::VERSION, " RRULE benchmark\n";
+diff --git a/bin/vobject b/bin/vobject
+index e52b4fb..43cd82f 100755
+--- a/bin/vobject
++++ b/bin/vobject
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env php
++#!/usr/bin/php
+ <?php
+ 
+ namespace Sabre\VObject;
+@@ -6,8 +6,8 @@ namespace Sabre\VObject;
+ // This sucks.. we have to try to find the composer autoloader. But chances
+ // are, we can't find it this way. So we'll do our bestest
+ $paths = array(
+-    __DIR__ . '/../vendor/autoload.php',  // In case vobject is cloned directly
+-    __DIR__ . '/../../../autoload.php',   // In case vobject is a composer dependency.
++    __DIR__ . '/../lib/autoload.php',			  // In case vobject is used from the package tree
++    __DIR__ . '/../share/php/sabre21/Sabre/VObject/autoload.php', // In case vobject is used from the system path.
+ );
+ 
+ foreach($paths as $path) {
+diff --git a/tests/bootstrap.php b/tests/bootstrap.php
+index a01f8f9..0abcff3 100644
+--- a/tests/bootstrap.php
++++ b/tests/bootstrap.php
+@@ -3,8 +3,8 @@
+ date_default_timezone_set('UTC');
+ 
+ $try = array(
+-    __DIR__ . '/../vendor/autoload.php',
+-    __DIR__ . '/../../../autoload.php',
++    __DIR__ . '/../lib/autoload.php',
++    '/usr/share/php/sabre21/Sabre/VObject/autoload.php',
+ );
+ 
+ foreach($try as $path) {

0002-replace-with-homemade-tests-autoloader.patch Added

debian.changelog Changed

@@ -1,55 +1,302 @@
-php-sabre-vobject (3.4.5-1) unstable; urgency=low
+php-sabre-vobject-3 (3.5.3-1) unstable; urgency=low
+
+  * Updated to upstream 3.5.3
+  * Moved Sabre Libs to sabre21/Sabre directory to be in line
+    with the upcoming Debian 9 package (for Kolab Package)
+  * renamed package to php-sabre-vobject-3
+  * removed symfony autoloader for phpunit tests
+
+ -- Daniel Hoffend <dh@dotlan.net>  Sun, 04 Dec 2016 21:04:00 +0200
+
+php-sabre-vobject-3 (3.5.2-1) unstable; urgency=medium
+
+   Visily Komrakov 
+  * incorrect work with timezone without event master
+
+   Evert Pot 
+  * Releasing 3.5.2
+
+ -- David Prévot <taffit@debian.org>  Wed, 27 Apr 2016 13:09:49 -0400
+
+php-sabre-vobject-3 (3.5.1-1) unstable; urgency=medium
+
+   Evert Pot 
+  * Add `RECURRENCE-ID` to the first event in the series.
+  * Releasing 3.5.1
+
+   David Prévot 
+  * Update Standards-Version to 3.9.8
+
+ -- David Prévot <taffit@debian.org>  Wed, 06 Apr 2016 21:19:08 -0400
+
+php-sabre-vobject-3 (3.5.0-2) unstable; urgency=medium
+
+  * Move maintenance within Debian PHP PEAR Maintainers
+  * Update Standards-Version to 3.9.7
+  * Build-depend on now split php-mbstring
+  * Rebuild with latest pkg-php-tools for the PHP 7.0 transition
+
+ -- David Prévot <taffit@debian.org>  Sat, 05 Mar 2016 12:44:22 -0400
+
+php-sabre-vobject-3 (3.5.0-1) unstable; urgency=medium
+
+   Evert Pot 
+  * PHP 7 support
+  * Releasing sabre/vobject 3.5.0
+
+ -- David Prévot <taffit@debian.org>  Mon, 11 Jan 2016 21:15:37 -0400
+
+php-sabre-vobject-3 (3.4.8-1) unstable; urgency=medium
+
+   Evert Pot 
+  * 3.4.8 release
+
+   Philipp Kewisch 
+  * Include DTEND in invitations
+
+   David Prévot 
+  * Update copyright (years)
+
+ -- David Prévot <taffit@debian.org>  Mon, 04 Jan 2016 22:55:20 -0400
+
+
+php-sabre-vobject-3 (3.4.7-1) unstable; urgency=medium
+
+   Dominik Tobschall 
+  * Handle NoInstancesException in isInTimeRange()
+
+   Evert Pot 
+  * Releasing sabre/vobject 3.4.7
+
+ -- David Prévot <taffit@debian.org>  Sat, 05 Sep 2015 11:01:56 -0400
+
+php-sabre-vobject-3 (3.4.6-1) unstable; urgency=medium
+
+   Armin Hackmann 
+  * modify DTEND for all-day events to make sure DTEND is considered non inclusive
+  * consider timezone of the timerange
+
+ -- David Prévot <taffit@debian.org>  Tue, 11 Aug 2015 15:45:53 +0200
+
+php-sabre-vobject (3.4.5-2) unstable; urgency=low
 
   * Upstream Version Bump
   * Initlal Release for Kolab Winterfell
 
- -- hede <kolab983@der-he.de>  Sat, 25 Jun 2013 12:00:00 +0200
+ -- hede <kolab983@der-he.de>  Sat, 25 Jun 2016 12:00:00 +0200
 
-php-sabre-vobject (2.1.5-3) unstable; urgency=medium
+php-sabre-vobject-3 (3.4.5-1) unstable; urgency=medium
 
-  * Fix testsuite for php >= 5.6.1
-  * Document current Git branch
+   Evert Pot 
+  * Converting vcards with a LANG property from 3.0 to 4.0 errors.
+  * Releasing sabre/vobject 3.4.5
 
- -- David Prévot <taffit@debian.org>  Sun, 26 Oct 2014 15:42:24 -0400
+ -- David Prévot <taffit@debian.org>  Sat, 20 Jun 2015 13:40:49 -0400
 
-php-sabre-vobject (2.1.5-2) unstable; urgency=medium
+php-sabre-vobject-3 (3.4.4-1) unstable; urgency=medium
 
-  * No tests if DEB_BUILD_OPTIONS contains nocheck
-  * Add hint about security maintenance in Jessie
-  * Drop now useless XS-Testsuite
+  * Rename as php-sabre-vobject-3.
+    Install everything in its own path to be co-installable with other
+    versions of php-sabre-vobject.
+
+ -- David Prévot <taffit@debian.org>  Sun, 31 May 2015 19:14:48 -0400
+
+php-sabre-vobject (3.4.4-1) experimental; urgency=medium
+
+   Evert Pot 
+  * Fixed undefined index 'foo@bar.com' notices.
+
+ -- David Prévot <taffit@debian.org>  Wed, 27 May 2015 17:29:28 -0400
+
+php-sabre-vobject (3.4.3-1) experimental; urgency=medium
+
+   Evert Pot 
+  * Detect wrong ENCODING parameters.
+  * Corrected validation of EXDATE.
+  * BYSETPOS with values below -1 breaks and hangs.
+
+   Tomas Lindquist Olsen 
+  * Fix BYDAY=-5TH
+
+   David Prévot 
+  * Fix CLI install path
+  * Fix vobject CLI name in previous changelog entry
+
+   Thomas Bruederli 
+  * Fix Property\VCard\Date to serialize DateTime objects as date-only strings
+
+ -- David Prévot <taffit@debian.org>  Tue, 19 May 2015 15:21:37 -0400
+
+php-sabre-vobject (3.4.2-1) experimental; urgency=medium
+
+   Evert Pot 
+  * Replying to an event without master event was broken.
+
+ -- David Prévot <taffit@debian.org>  Wed, 25 Feb 2015 22:01:45 -0400
+
+php-sabre-vobject (3.4.1-1) experimental; urgency=medium
+
+   Evert Pot 
+  * Making the recurrence iterator faster on large calendars.
+  * Updated changelog, releasing this as 3.4.1.
+
+   Ivan Enderlin 
+  * Create and declare the VAVAILABILITY component.
+  * Create and declare the AVAILABLE component.
+  * Declare the AVAILABLE component.
+
+   David Prévot 
+  * Provide homemade autoload.php
+  * Install vobject and generate_vcards CLIs
+
+ -- David Prévot <taffit@debian.org>  Tue, 24 Feb 2015 17:16:24 -0400
+
+php-sabre-vobject (3.3.5-1) experimental; urgency=medium
+
+   David Prévot 
+  * Update watch file
+  * Update copyright
+
+   Evert Pot 
+  * Releasing 3.3.5
+
+ -- David Prévot <taffit@debian.org>  Sat, 10 Jan 2015 09:44:50 -0400
+
+php-sabre-vobject (3.3.4-1) experimental; urgency=medium
+
+   Evert Pot 
+  * Support for converting ANNIVERSARY
+  * Allowing 'reference timezones' for freebusy reports and other places.
+  * Reference timezone to expander and recurrence iterator.
+  * Added getTimeZone to VTIMEZONE components.
+
+   Armin Hackmann 
+  * Support for multiple anniversaries in a vCard
+
+   Ivan Enderlin 
+  * Simpler way to check UTF-8.
+
+   David Prévot 
+  * Use php-symfony-class-loader instead of php-symfony-classloader
+
+ -- David Prévot <taffit@debian.org>  Fri, 28 Nov 2014 16:42:28 -0400
+
+php-sabre-vobject (3.3.3-1) experimental; urgency=medium
+
+   Evert Pot 
+  * Adding DTSTART to CANCEL and REPLY messages.
+  * Respect SCHEDULE-AGENT on ORGANIZER.
+  * There's a new windows timezone.

debian.control Changed

@@ -1,26 +1,30 @@
-Source: php-sabre-vobject
+Source: php-sabre-vobject-3
 Section: php
 Priority: optional
-Maintainer: ownCloud for Debian maintainers <pkg-owncloud-maintainers@lists.alioth.debian.org>
+Maintainer: Debian PHP PEAR Maintainers <pkg-php-pear@lists.alioth.debian.org>
 Uploaders: David Prévot <taffit@debian.org>
 Build-Depends: debhelper (>= 9),
-               php-symfony-classloader,
+               help2man,
+               php-codesniffer,
+               phpab,
                phpunit,
                pkg-php-tools (>= 1.7~)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://sabre.io/vobject/
-Vcs-Git: git://anonscm.debian.org/pkg-owncloud/php-sabre-vobject.git -b 2.1
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-owncloud/php-sabre-vobject.git
+Vcs-Git: git://anonscm.debian.org/pkg-php/php-sabre-vobject.git -b 3
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-php/php-sabre-vobject.git
 
-Package: php-sabre-vobject
+Package: php-sabre-vobject-3
 Architecture: all
 Depends: ${misc:Depends}, ${phpcomposer:Debian-require}
 Suggests: ${phpcomposer:Debian-suggest}
+Replaces: ${phpcomposer:Debian-replace}
+Breaks: ${phpcomposer:Debian-conflict}, ${phpcomposer:Debian-replace}
+Provides: ${phpcomposer:Debian-provide}
 Description: library to parse and manipulate iCalendar and vCard objects
- The SabreTooth VObject library allows one to easily parse and
- manipulate iCalendar and vCard objects using PHP. The goal of the
- VObject library is to create a very complete library, with an easy to
- use API.
+ ${phpcomposer:description}.
+ The goal of the VObject library is to create a very complete library,
+ with an easy to use API.
  .
  This project is a spin-off from SabreDAV, where it has been used for
  several years.

debian.rules Changed

@@ -1,16 +1,16 @@
 #!/usr/bin/make -f
+
+UPSTREAM := $(shell dpkg-parsechangelog --show-field=Version | sed 's/-^-*//')
+
 %:
 	dh $@ --with phpcomposer
 
 override_dh_auto_build:
-	# resort folder structure
-	mv lib VObject
-	mkdir -p lib/Sabre
-	mv VObject lib/Sabre/
-	mkdir -p tests/Sabre
-	mv tests/VObject tests/Sabre/
-	#forward to original dh_auto_build
 	dh_auto_build
+	phpab --output lib/autoload.php lib
+	phpab --output tests/autoload.php tests lib
+	cp -a bin/generate_vcards bin/generate_vcards3
+	cp -a bin/vobject bin/vobject3
 
 override_dh_auto_clean:
 	rm -rf tests/temp
@@ -19,9 +19,34 @@
 override_dh_auto_test:
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 	cd tests && phpunit
+	# phpcs -v --standard=tests/phpcs/ruleset.xml lib
 else
 	@echo "** tests disabled"
 endif
 
+override_dh_installman:
+	mkdir --parent $(CURDIR)/debian/tmp
+	help2man \
+		--help-option=\  \
+		--version-string=$(UPSTREAM) \
+		--no-info \
+		--include=$(CURDIR)/debian/vobject.1.in \
+		"echo -n Usage: && $(CURDIR)/bin/vobject3 2>&1 \
+			| tail -n+3 | sed -re 's:\x1B\0-9;*mK::g' \
+			-e 's/inputformat If/inputformat  If/' -e 's/must/ must/' \
+			-e 's/ C/  C/' \
+			-e 's/   vobject/\n  vobject/' \
+			-e 's/vobject^3/vobject3 /'" \
+		> $(CURDIR)/debian/tmp/vobject3.1
+	help2man \
+		--help-option=\  \
+		--version-string=$(UPSTREAM) \
+		--no-info \
+		--include=$(CURDIR)/debian/generate_vcards.1.in \
+		"echo -n Usage: && $(CURDIR)/bin/generate_vcards3 2>&1 | tail -n+3 \
+		| sed -re 's/generate_vcards^3/generate_vcards3 /'" \
+		> $(CURDIR)/debian/tmp/generate_vcards3.1
+	dh_installman
+
 get-orig-source:
 	uscan --verbose --rename --force

debian.series Changed

debian.tar.gz/clean Added

debian.tar.gz/copyright Changed

debian.tar.gz/gbp.conf Changed

debian.tar.gz/generate_vcards.1.in Added

debian.tar.gz/install Changed

debian.tar.gz/manpages Added

debian.tar.gz/vobject.1.in Added

debian.tar.gz/watch Changed

php-sabre-vobject.dsc Changed

@@ -1,17 +1,22 @@
 Format: 1.0
-Source: php-sabre-vobject
-Binary: php-sabre-vobject
+Source: php-sabre-vobject-3
+Binary: php-sabre-vobject-3
 Architecture: all
-Version: 3.4.5-1
+Version: 3.5.3-1
 Maintainer: ownCloud for Debian maintainers <pkg-owncloud-maintainers@lists.alioth.debian.org>
 Uploaders: David Prévot <taffit@debian.org>
 Homepage: http://sabre.io/vobject/
 Standards-Version: 3.9.3
+Vcs-Git: git://anonscm.debian.org/pkg-owncloud/php-sabre-vobject.git -b 3
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-owncloud/php-sabre-vobject.git
-Vcs-Git: git://anonscm.debian.org/pkg-owncloud/php-sabre-vobject.git -b 2.1
-Build-Depends: debhelper (>= 9), php-symfony-classloader, phpunit, pkg-php-tools (>= 1.7~)
+Build-Depends: debhelper (>= 9),
+               help2man,
+               php-codesniffer,
+               phpab,
+               phpunit,
+               pkg-php-tools (>= 1.7~)
 Package-List:
- php-sabre-vobject deb php optional arch=all
+ php-sabre-vobject-3 deb php optional arch=all
 Files:
- 00000000000000000000000000000000 0 sabre-vobject-3.4.5.tar.gz
+ 00000000000000000000000000000000 0 sabre-vobject-3.5.3.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz

sabre-vobject-3.4.5.tar.gz/lib/Property/Float.php Deleted

@@ -1,104 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Property;
-
-use
-    Sabre\VObject\Property;
-
-/**
- * Float property
- *
- * This object represents FLOAT values. These can be 1 or more floating-point
- * numbers.
- *
- * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Float extends Property {
-
-    /**
-     * In case this is a multi-value property. This string will be used as a
-     * delimiter.
-     *
-     * @var string|null
-     */
-    public $delimiter = ';';
-
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     * @return void
-     */
-    public function setRawMimeDirValue($val) {
-
-        $val = explode($this->delimiter, $val);
-        foreach($val as &$item) {
-            $item = (float)$item;
-        }
-        $this->setParts($val);
-
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue() {
-
-        return implode(
-            $this->delimiter,
-            $this->getParts()
-        );
-
-    }
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return "FLOAT";
-
-    }
-
-    /**
-     * Returns the value, in the format it should be encoded for json.
-     *
-     * This method must always return an array.
-     *
-     * @return array
-     */
-    public function getJsonValue() {
-
-        $val = array_map(
-            function($item) {
-
-                return (float)$item;
-
-            },
-            $this->getParts()
-        );
-
-        // Special-casing the GEO property.
-        //
-        // See:
-        // http://tools.ietf.org/html/draft-ietf-jcardcal-jcal-04#section-3.4.1.2
-        if ($this->name==='GEO') {
-            return array($val);
-        } else {
-            return $val;
-        }
-
-    }
-}

sabre-vobject-3.4.5.tar.gz/lib/Property/Integer.php Deleted

@@ -1,72 +0,0 @@
-<?php
-
-namespace Sabre\VObject\Property;
-
-use
-    Sabre\VObject\Property;
-
-/**
- * Integer property
- *
- * This object represents INTEGER values. These are always a single integer.
- * They may be preceeded by either + or -.
- *
- * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
- * @author Evert Pot (http://evertpot.com/)
- * @license http://sabre.io/license/ Modified BSD License
- */
-class Integer extends Property {
-
-    /**
-     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
-     *
-     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
-     * not yet done, but parameters are not included.
-     *
-     * @param string $val
-     * @return void
-     */
-    public function setRawMimeDirValue($val) {
-
-        $this->setValue((int)$val);
-
-    }
-
-    /**
-     * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
-     */
-    public function getRawMimeDirValue() {
-
-        return $this->value;
-
-    }
-
-    /**
-     * Returns the type of value.
-     *
-     * This corresponds to the VALUE= parameter. Every property also has a
-     * 'default' valueType.
-     *
-     * @return string
-     */
-    public function getValueType() {
-
-        return "INTEGER";
-
-    }
-
-    /**
-     * Returns the value, in the format it should be encoded for json.
-     *
-     * This method must always return an array.
-     *
-     * @return array
-     */
-    public function getJsonValue() {
-
-        return array((int)$this->getValue());
-
-    }
-}

sabre-vobject-3.4.5.tar.gz/.travis.yml -> sabre-vobject-3.5.3.tar.gz/.travis.yml Changed

sabre-vobject-3.4.5.tar.gz/ChangeLog.md -> sabre-vobject-3.5.3.tar.gz/ChangeLog.md Changed

@@ -1,6 +1,67 @@
 ChangeLog
 =========
 
+3.5.3 (2016-10-06)
+------------------
+
+* #331: Fix dealing with multiple overridden instances falling on the same
+  date/time (@afedyk-sugarcrm).
+
+
+3.5.2 (2016-04-24)
+-----------------
+
+* #312: Backported a fix related to iTip processing of events with timezones,
+  without a master event.
+
+
+3.5.1 (2016-04-06)
+------------------
+
+* #309: When expanding recurring events, the first event should also have a
+  `RECURRENCE-ID` property.
+* #306: iTip REPLYs to the first instance of a recurring event was not handled
+  correctly.
+
+
+3.5.0 (2016-01-11)
+------------------
+
+* This release supports PHP 7, contrary to 3.4.x versions.
+* BC Break: `Sabre\VObject\Property\Float` has been renamed to
+  `Sabre\VObject\Property\FloatValue`.
+* BC Break: `Sabre\VObject\Property\Integer` has been renamed to
+  `Sabre\VObject\Property\IntegerValue`.
+
+
+3.4.9 (2016-01-11)
+------------------
+
+* This package now specifies in composer.json that it does not support PHP 7.
+  For PHP 7, use version 3.5.x or 4.x.
+
+
+3.4.8 (2016-01-04)
+------------------
+
+* #284: When generating `CANCEL` iTip messages, we now include `DTEND`.
+  (@kewisch).
+
+
+3.4.7 (2015-09-05)
+------------------
+
+* #253: Handle `isInTimeRange` for recurring events that have 0 valid
+  instances. (@DominikTo, @migrax).
+
+
+3.4.6 (2015-08-06)
+------------------
+
+* #250: Recurring all-day events are incorrectly included in time range
+  requests when not using UTC in the time range. (@armin-hackmann)
+
+
 3.4.5 (2015-06-02)
 ------------------

sabre-vobject-3.4.5.tar.gz/LICENSE -> sabre-vobject-3.5.3.tar.gz/LICENSE Changed

sabre-vobject-3.4.5.tar.gz/lib/Cli.php -> sabre-vobject-3.5.3.tar.gz/lib/Cli.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Component.php -> sabre-vobject-3.5.3.tar.gz/lib/Component.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Component/Available.php -> sabre-vobject-3.5.3.tar.gz/lib/Component/Available.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Component/VAlarm.php -> sabre-vobject-3.5.3.tar.gz/lib/Component/VAlarm.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Component/VAvailability.php -> sabre-vobject-3.5.3.tar.gz/lib/Component/VAvailability.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Component/VCalendar.php -> sabre-vobject-3.5.3.tar.gz/lib/Component/VCalendar.php Changed

@@ -14,7 +14,7 @@
  *
  * This component adds functionality to a component, specific for a VCALENDAR.
  *
- * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
@@ -57,8 +57,8 @@
         'DATE'             => 'Sabre\\VObject\\Property\\ICalendar\\Date',
         'DATE-TIME'        => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
         'DURATION'         => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
-        'FLOAT'            => 'Sabre\\VObject\\Property\\Float',
-        'INTEGER'          => 'Sabre\\VObject\\Property\\Integer',
+        'FLOAT'            => 'Sabre\\VObject\\Property\\FloatValue',
+        'INTEGER'          => 'Sabre\\VObject\\Property\\IntegerValue',
         'PERIOD'           => 'Sabre\\VObject\\Property\\ICalendar\\Period',
         'RECUR'            => 'Sabre\\VObject\\Property\\ICalendar\\Recur',
         'TEXT'             => 'Sabre\\VObject\\Property\\Text',
@@ -86,10 +86,10 @@
         'CLASS'             => 'Sabre\\VObject\\Property\\FlatText',
         'COMMENT'           => 'Sabre\\VObject\\Property\\FlatText',
         'DESCRIPTION'       => 'Sabre\\VObject\\Property\\FlatText',
-        'GEO'               => 'Sabre\\VObject\\Property\\Float',
+        'GEO'               => 'Sabre\\VObject\\Property\\FloatValue',
         'LOCATION'          => 'Sabre\\VObject\\Property\\FlatText',
-        'PERCENT-COMPLETE'  => 'Sabre\\VObject\\Property\\Integer',
-        'PRIORITY'          => 'Sabre\\VObject\\Property\\Integer',
+        'PERCENT-COMPLETE'  => 'Sabre\\VObject\\Property\\IntegerValue',
+        'PRIORITY'          => 'Sabre\\VObject\\Property\\IntegerValue',
         'RESOURCES'         => 'Sabre\\VObject\\Property\\Text',
         'STATUS'            => 'Sabre\\VObject\\Property\\FlatText',
         'SUMMARY'           => 'Sabre\\VObject\\Property\\FlatText',
@@ -127,14 +127,14 @@
 
         // Alarm Component Properties
         'ACTION'        => 'Sabre\\VObject\\Property\\FlatText',
-        'REPEAT'        => 'Sabre\\VObject\\Property\\Integer',
+        'REPEAT'        => 'Sabre\\VObject\\Property\\IntegerValue',
         'TRIGGER'       => 'Sabre\\VObject\\Property\\ICalendar\\Duration',
 
         // Change Management Component Properties
         'CREATED'       => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
         'DTSTAMP'       => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
         'LAST-MODIFIED' => 'Sabre\\VObject\\Property\\ICalendar\\DateTime',
-        'SEQUENCE'      => 'Sabre\\VObject\\Property\\Integer',
+        'SEQUENCE'      => 'Sabre\\VObject\\Property\\IntegerValue',
 
         // Request Status
         'REQUEST-STATUS' => 'Sabre\\VObject\\Property\\Text',

sabre-vobject-3.4.5.tar.gz/lib/Component/VCard.php -> sabre-vobject-3.5.3.tar.gz/lib/Component/VCard.php Changed

@@ -11,7 +11,7 @@
  * This component represents the BEGIN:VCARD and END:VCARD found in every
  * vcard.
  *
- * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
@@ -45,8 +45,8 @@
         'DATE'             => 'Sabre\\VObject\\Property\\VCard\\Date',
         'DATE-TIME'        => 'Sabre\\VObject\\Property\\VCard\\DateTime',
         'DATE-AND-OR-TIME' => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime', // vCard only
-        'FLOAT'            => 'Sabre\\VObject\\Property\\Float',
-        'INTEGER'          => 'Sabre\\VObject\\Property\\Integer',
+        'FLOAT'            => 'Sabre\\VObject\\Property\\FloatValue',
+        'INTEGER'          => 'Sabre\\VObject\\Property\\IntegerValue',
         'LANGUAGE-TAG'     => 'Sabre\\VObject\\Property\\VCard\\LanguageTag',
         'TIMESTAMP'        => 'Sabre\\VObject\\Property\\VCard\\TimeStamp',
         'TEXT'             => 'Sabre\\VObject\\Property\\Text',

sabre-vobject-3.4.5.tar.gz/lib/Component/VEvent.php -> sabre-vobject-3.5.3.tar.gz/lib/Component/VEvent.php Changed

@@ -4,13 +4,14 @@
 
 use Sabre\VObject;
 use Sabre\VObject\Recur\EventIterator;
+use Sabre\VObject\Recur\NoInstancesException;
 
 /**
  * VEvent component
  *
  * This component contains some additional functionality specific for VEVENT's.
  *
- * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
@@ -30,7 +31,19 @@
     public function isInTimeRange(\DateTime $start, \DateTime $end) {
 
         if ($this->RRULE) {
-            $it = new EventIterator($this);
+
+            try {
+
+                $it = new EventIterator($this, null, $start->getTimezone());
+
+            } catch (NoInstancesException $e) {
+
+                // If we've catched this exception, there are no instances
+                // for the event that fall into the specified time-range.
+                return false;
+
+            }
+
             $it->fastForward($start);
 
             // We fast-forwarded to a spot where the end-time of the
@@ -43,7 +56,7 @@
 
         }
 
-        $effectiveStart = $this->DTSTART->getDateTime();
+        $effectiveStart = $this->DTSTART->getDateTime($start->getTimezone());
         if (isset($this->DTEND)) {
 
             // The DTEND property is considered non inclusive. So for a 3 day
@@ -52,7 +65,7 @@
             //
             // See:
             // http://tools.ietf.org/html/rfc5545#page-54
-            $effectiveEnd = $this->DTEND->getDateTime();
+            $effectiveEnd = $this->DTEND->getDateTime($end->getTimezone());
 
         } elseif (isset($this->DURATION)) {
             $effectiveEnd = clone $effectiveStart;
@@ -64,7 +77,7 @@
             $effectiveEnd = clone $effectiveStart;
         }
         return (
-            ($start <= $effectiveEnd) && ($end > $effectiveStart)
+            ($start < $effectiveEnd) && ($end > $effectiveStart)
         );
 
     }

sabre-vobject-3.4.5.tar.gz/lib/Component/VFreeBusy.php -> sabre-vobject-3.5.3.tar.gz/lib/Component/VFreeBusy.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Component/VJournal.php -> sabre-vobject-3.5.3.tar.gz/lib/Component/VJournal.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Component/VTimeZone.php -> sabre-vobject-3.5.3.tar.gz/lib/Component/VTimeZone.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Component/VTodo.php -> sabre-vobject-3.5.3.tar.gz/lib/Component/VTodo.php Changed

sabre-vobject-3.4.5.tar.gz/lib/DateTimeParser.php -> sabre-vobject-3.5.3.tar.gz/lib/DateTimeParser.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Document.php -> sabre-vobject-3.5.3.tar.gz/lib/Document.php Changed

sabre-vobject-3.4.5.tar.gz/lib/ElementList.php -> sabre-vobject-3.5.3.tar.gz/lib/ElementList.php Changed

sabre-vobject-3.4.5.tar.gz/lib/EofException.php -> sabre-vobject-3.5.3.tar.gz/lib/EofException.php Changed

sabre-vobject-3.4.5.tar.gz/lib/FreeBusyGenerator.php -> sabre-vobject-3.5.3.tar.gz/lib/FreeBusyGenerator.php Changed

sabre-vobject-3.4.5.tar.gz/lib/ITip/Broker.php -> sabre-vobject-3.5.3.tar.gz/lib/ITip/Broker.php Changed

@@ -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) 2011-2015 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
@@ -525,6 +525,11 @@
                     $event->add('SUMMARY', $calendar->VEVENT->SUMMARY->getValue());
                 }
                 $event->add(clone $calendar->VEVENT->DTSTART);
+                if (isset($calendar->VEVENT->DTEND)) {
+                    $event->add(clone $calendar->VEVENT->DTEND);
+                } elseif (isset($calendar->VEVENT->DURATION)) {
+                    $event->add(clone $calendar->VEVENT->DURATION);
+                }
                 $org = $event->add('ORGANIZER', $eventInfo'organizer');
                 if ($eventInfo'organizerName') $org'CN' = $eventInfo'organizerName';
                 $event->add('ATTENDEE', $attendee'href', array(
@@ -735,6 +740,11 @@
             if (isset($eventInfo'instances'$instance'id')) {
                 $instanceObj = $eventInfo'instances'$instance'id';
                 $event->add(clone $instanceObj->DTSTART);
+                if (isset($instanceObj->DTEND)) {
+                    $event->add(clone $instanceObj->DTEND);
+                } elseif (isset($instanceObj->DURATION)) {
+                    $event->add(clone $instanceObj->DURATION);
+                }
                 if (isset($instanceObj->SUMMARY)) {
                     $event->add('SUMMARY', $instanceObj->SUMMARY->getValue());
                 } elseif ($summary) {
@@ -797,9 +807,16 @@
      * 1. uid
      * 2. organizer
      * 3. organizerName
-     * 4. attendees
-     * 5. instances
-     *
+     * 4. organizerScheduleAgent
+     * 5. organizerForceSend
+     * 6. instances
+     * 7. attendees
+     * 8. sequence
+     * 9. exdate
+     * 10. timezone - strictly the timezone on which the recurrence rule is
+     *                based on.
+     * 11. significantChangeHash
+     * 12. status
      * @param VCalendar $calendar
      * @return array
      */
@@ -868,9 +885,13 @@
                 $status = strtoupper($vevent->STATUS->getValue());
             }
 
-            $recurId = isset($vevent->{'RECURRENCE-ID'})?$vevent->{'RECURRENCE-ID'}->getValue():'master';
-            if ($recurId==='master') {
-                $timezone = $vevent->DTSTART->getDateTime()->getTimeZone();
+            $recurId = isset($vevent->{'RECURRENCE-ID'}) ? $vevent->{'RECURRENCE-ID'}->getValue() : 'master';
+            if (is_null($timezone)) {
+                if ($recurId === 'master') {
+                    $timezone = $vevent->DTSTART->getDateTime()->getTimeZone();
+                } else {
+                    $timezone = $vevent->{'RECURRENCE-ID'}->getDateTime()->getTimeZone();
+                }
             }
             if(isset($vevent->ATTENDEE)) {
                 foreach($vevent->ATTENDEE as $attendee) {

sabre-vobject-3.4.5.tar.gz/lib/ITip/ITipException.php -> sabre-vobject-3.5.3.tar.gz/lib/ITip/ITipException.php Changed

sabre-vobject-3.4.5.tar.gz/lib/ITip/Message.php -> sabre-vobject-3.5.3.tar.gz/lib/ITip/Message.php Changed

sabre-vobject-3.4.5.tar.gz/lib/ITip/SameOrganizerForAllComponentsException.php -> sabre-vobject-3.5.3.tar.gz/lib/ITip/SameOrganizerForAllComponentsException.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Node.php -> sabre-vobject-3.5.3.tar.gz/lib/Node.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Parameter.php -> sabre-vobject-3.5.3.tar.gz/lib/Parameter.php Changed

sabre-vobject-3.4.5.tar.gz/lib/ParseException.php -> sabre-vobject-3.5.3.tar.gz/lib/ParseException.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Parser/Json.php -> sabre-vobject-3.5.3.tar.gz/lib/Parser/Json.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Parser/MimeDir.php -> sabre-vobject-3.5.3.tar.gz/lib/Parser/MimeDir.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Parser/Parser.php -> sabre-vobject-3.5.3.tar.gz/lib/Parser/Parser.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Property.php -> sabre-vobject-3.5.3.tar.gz/lib/Property.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Property/Binary.php -> sabre-vobject-3.5.3.tar.gz/lib/Property/Binary.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Property/Boolean.php -> sabre-vobject-3.5.3.tar.gz/lib/Property/Boolean.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Property/FlatText.php -> sabre-vobject-3.5.3.tar.gz/lib/Property/FlatText.php Changed

sabre-vobject-3.5.3.tar.gz/lib/Property/FloatValue.php Added

@@ -0,0 +1,104 @@
+<?php
+
+namespace Sabre\VObject\Property;
+
+use
+    Sabre\VObject\Property;
+
+/**
+ * Float property
+ *
+ * This object represents FLOAT values. These can be 1 or more floating-point
+ * numbers.
+ *
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class FloatValue extends Property {
+
+    /**
+     * In case this is a multi-value property. This string will be used as a
+     * delimiter.
+     *
+     * @var string|null
+     */
+    public $delimiter = ';';
+
+    /**
+     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+     *
+     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+     * not yet done, but parameters are not included.
+     *
+     * @param string $val
+     * @return void
+     */
+    public function setRawMimeDirValue($val) {
+
+        $val = explode($this->delimiter, $val);
+        foreach($val as &$item) {
+            $item = (float)$item;
+        }
+        $this->setParts($val);
+
+    }
+
+    /**
+     * Returns a raw mime-dir representation of the value.
+     *
+     * @return string
+     */
+    public function getRawMimeDirValue() {
+
+        return implode(
+            $this->delimiter,
+            $this->getParts()
+        );
+
+    }
+
+    /**
+     * Returns the type of value.
+     *
+     * This corresponds to the VALUE= parameter. Every property also has a
+     * 'default' valueType.
+     *
+     * @return string
+     */
+    public function getValueType() {
+
+        return "FLOAT";
+
+    }
+
+    /**
+     * Returns the value, in the format it should be encoded for json.
+     *
+     * This method must always return an array.
+     *
+     * @return array
+     */
+    public function getJsonValue() {
+
+        $val = array_map(
+            function($item) {
+
+                return (float)$item;
+
+            },
+            $this->getParts()
+        );
+
+        // Special-casing the GEO property.
+        //
+        // See:
+        // http://tools.ietf.org/html/draft-ietf-jcardcal-jcal-04#section-3.4.1.2
+        if ($this->name==='GEO') {
+            return array($val);
+        } else {
+            return $val;
+        }
+
+    }
+}

sabre-vobject-3.4.5.tar.gz/lib/Property/ICalendar/CalAddress.php -> sabre-vobject-3.5.3.tar.gz/lib/Property/ICalendar/CalAddress.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Property/ICalendar/Date.php -> sabre-vobject-3.5.3.tar.gz/lib/Property/ICalendar/Date.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Property/ICalendar/DateTime.php -> sabre-vobject-3.5.3.tar.gz/lib/Property/ICalendar/DateTime.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Property/ICalendar/Duration.php -> sabre-vobject-3.5.3.tar.gz/lib/Property/ICalendar/Duration.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Property/ICalendar/Period.php -> sabre-vobject-3.5.3.tar.gz/lib/Property/ICalendar/Period.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Property/ICalendar/Recur.php -> sabre-vobject-3.5.3.tar.gz/lib/Property/ICalendar/Recur.php Changed

sabre-vobject-3.5.3.tar.gz/lib/Property/IntegerValue.php Added

@@ -0,0 +1,72 @@
+<?php
+
+namespace Sabre\VObject\Property;
+
+use
+    Sabre\VObject\Property;
+
+/**
+ * Integer property
+ *
+ * This object represents INTEGER values. These are always a single integer.
+ * They may be preceeded by either + or -.
+ *
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/ Modified BSD License
+ */
+class IntegerValue extends Property {
+
+    /**
+     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+     *
+     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+     * not yet done, but parameters are not included.
+     *
+     * @param string $val
+     * @return void
+     */
+    public function setRawMimeDirValue($val) {
+
+        $this->setValue((int)$val);
+
+    }
+
+    /**
+     * Returns a raw mime-dir representation of the value.
+     *
+     * @return string
+     */
+    public function getRawMimeDirValue() {
+
+        return $this->value;
+
+    }
+
+    /**
+     * Returns the type of value.
+     *
+     * This corresponds to the VALUE= parameter. Every property also has a
+     * 'default' valueType.
+     *
+     * @return string
+     */
+    public function getValueType() {
+
+        return "INTEGER";
+
+    }
+
+    /**
+     * Returns the value, in the format it should be encoded for json.
+     *
+     * This method must always return an array.
+     *
+     * @return array
+     */
+    public function getJsonValue() {
+
+        return array((int)$this->getValue());
+
+    }
+}

sabre-vobject-3.4.5.tar.gz/lib/Property/Text.php -> sabre-vobject-3.5.3.tar.gz/lib/Property/Text.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Property/Time.php -> sabre-vobject-3.5.3.tar.gz/lib/Property/Time.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Property/Unknown.php -> sabre-vobject-3.5.3.tar.gz/lib/Property/Unknown.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Property/Uri.php -> sabre-vobject-3.5.3.tar.gz/lib/Property/Uri.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Property/UtcOffset.php -> sabre-vobject-3.5.3.tar.gz/lib/Property/UtcOffset.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Property/VCard/Date.php -> sabre-vobject-3.5.3.tar.gz/lib/Property/VCard/Date.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Property/VCard/DateAndOrTime.php -> sabre-vobject-3.5.3.tar.gz/lib/Property/VCard/DateAndOrTime.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Property/VCard/DateTime.php -> sabre-vobject-3.5.3.tar.gz/lib/Property/VCard/DateTime.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Property/VCard/LanguageTag.php -> sabre-vobject-3.5.3.tar.gz/lib/Property/VCard/LanguageTag.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Property/VCard/TimeStamp.php -> sabre-vobject-3.5.3.tar.gz/lib/Property/VCard/TimeStamp.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Reader.php -> sabre-vobject-3.5.3.tar.gz/lib/Reader.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Recur/EventIterator.php -> sabre-vobject-3.5.3.tar.gz/lib/Recur/EventIterator.php Changed

@@ -50,7 +50,7 @@
  *
  * The recurrence iterator also does not yet support THISANDFUTURE.
  *
- * @copyright Copyright (C) 2011-2015 fruux GmbH (https://fruux.com/).
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
@@ -278,16 +278,9 @@
         if (isset($event->DTEND)) {
             $event->DTEND->setDateTime($this->getDtEnd(), $event->DTEND->isFloating());
         }
-        // Including a RECURRENCE-ID to the object, unless this is the first
-        // object.
-        //
-        // The inner recurIterator is always one step ahead, this is why we're
-        // checking for the key being higher than 1.
-        if ($this->recurIterator->key() > 1) {
-            $recurid = clone $event->DTSTART;
-            $recurid->name = 'RECURRENCE-ID';
-            $event->add($recurid);
-        }
+        $recurid = clone $event->DTSTART;
+        $recurid->name = 'RECURRENCE-ID';
+        $event->add($recurid);
         return $event;
 
     }
@@ -328,7 +321,7 @@
         $index = array();
         foreach($this->overriddenEvents as $key=>$event) {
             $stamp = $event->DTSTART->getDateTime($this->timeZone)->getTimeStamp();
-            $index$stamp = $key;
+            $index$stamp = $key;
         }
         krsort($index);
         $this->counter = 0;
@@ -375,8 +368,9 @@
         // overridden event may cut ahead.
         if ($this->overriddenEventsIndex) {
 
-            $offset = end($this->overriddenEventsIndex);
+            $offsets = end($this->overriddenEventsIndex);
             $timestamp = key($this->overriddenEventsIndex);
+            $offset = end($offsets);
             if (!$nextDate || $timestamp < $nextDate->getTimeStamp()) {
                 // Overridden event comes first.
                 $this->currentOverriddenEvent = $this->overriddenEvents$offset;
@@ -386,7 +380,10 @@
                 $this->currentDate = $this->currentOverriddenEvent->DTSTART->getDateTime($this->timeZone);
 
                 // Ensuring that this item will only be used once.
-                array_pop($this->overriddenEventsIndex);
+                array_pop($this->overriddenEventsIndex$timestamp);
+                if (!$this->overriddenEventsIndex$timestamp) {
+                    array_pop($this->overriddenEventsIndex);
+                }
 
                 // Exit point!
                 return;
@@ -454,7 +451,7 @@
     /**
      * Overridden event index.
      *
-     * Key is timestamp, value is the index of the item in the $overriddenEvent
+     * Key is timestamp, value is the list of indexes of the item in the $overriddenEvent
      * property.
      *
      * @var array

sabre-vobject-3.4.5.tar.gz/lib/Recur/NoInstancesException.php -> sabre-vobject-3.5.3.tar.gz/lib/Recur/NoInstancesException.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Recur/RDateIterator.php -> sabre-vobject-3.5.3.tar.gz/lib/Recur/RDateIterator.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Recur/RRuleIterator.php -> sabre-vobject-3.5.3.tar.gz/lib/Recur/RRuleIterator.php Changed

sabre-vobject-3.4.5.tar.gz/lib/RecurrenceIterator.php -> sabre-vobject-3.5.3.tar.gz/lib/RecurrenceIterator.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Splitter/ICalendar.php -> sabre-vobject-3.5.3.tar.gz/lib/Splitter/ICalendar.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Splitter/SplitterInterface.php -> sabre-vobject-3.5.3.tar.gz/lib/Splitter/SplitterInterface.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Splitter/VCard.php -> sabre-vobject-3.5.3.tar.gz/lib/Splitter/VCard.php Changed

sabre-vobject-3.4.5.tar.gz/lib/StringUtil.php -> sabre-vobject-3.5.3.tar.gz/lib/StringUtil.php Changed

sabre-vobject-3.4.5.tar.gz/lib/TimeZoneUtil.php -> sabre-vobject-3.5.3.tar.gz/lib/TimeZoneUtil.php Changed

sabre-vobject-3.4.5.tar.gz/lib/UUIDUtil.php -> sabre-vobject-3.5.3.tar.gz/lib/UUIDUtil.php Changed

sabre-vobject-3.4.5.tar.gz/lib/VCardConverter.php -> sabre-vobject-3.5.3.tar.gz/lib/VCardConverter.php Changed

sabre-vobject-3.4.5.tar.gz/lib/Version.php -> sabre-vobject-3.5.3.tar.gz/lib/Version.php Changed

sabre-vobject-3.4.5.tar.gz/lib/timezonedata/exchangezones.php -> sabre-vobject-3.5.3.tar.gz/lib/timezonedata/exchangezones.php Changed

sabre-vobject-3.4.5.tar.gz/lib/timezonedata/lotuszones.php -> sabre-vobject-3.5.3.tar.gz/lib/timezonedata/lotuszones.php Changed

sabre-vobject-3.4.5.tar.gz/lib/timezonedata/php-bc.php -> sabre-vobject-3.5.3.tar.gz/lib/timezonedata/php-bc.php Changed

sabre-vobject-3.4.5.tar.gz/lib/timezonedata/php-workaround.php -> sabre-vobject-3.5.3.tar.gz/lib/timezonedata/php-workaround.php Changed

sabre-vobject-3.4.5.tar.gz/lib/timezonedata/windowszones.php -> sabre-vobject-3.5.3.tar.gz/lib/timezonedata/windowszones.php Changed

sabre-vobject-3.4.5.tar.gz/tests/VObject/Component/VCalendarTest.php -> sabre-vobject-3.5.3.tar.gz/tests/VObject/Component/VCalendarTest.php Changed

sabre-vobject-3.4.5.tar.gz/tests/VObject/Component/VEventTest.php -> sabre-vobject-3.5.3.tar.gz/tests/VObject/Component/VEventTest.php Changed

@@ -43,7 +43,10 @@
         $tests = array($vevent4, new \DateTime('2011-01-01'), new \DateTime('2011-11-01'), false);
         // Event with no end date should be treated as lasting the entire day.
         $tests = array($vevent4, new \DateTime('2011-12-25 16:00:00'), new \DateTime('2011-12-25 17:00:00'), true);
-
+        // DTEND is non inclusive so all day events should not be returned on the next day.
+        $tests = array($vevent4, new \DateTime('2011-12-26 00:00:00'), new \DateTime('2011-12-26 17:00:00'), false);
+        // The timezone of timerange in question also needs to be considered.
+        $tests = array($vevent4, new \DateTime('2011-12-26 00:00:00', new \DateTimeZone('Europe/Berlin')), new \DateTime('2011-12-26 17:00:00', new \DateTimeZone('Europe/Berlin')), false);
 
         $vevent5 = clone $vevent;
         $vevent5->DURATION = 'P1D';
@@ -68,6 +71,17 @@
         $vevent7->DTSTART'VALUE' = 'DATE';
         $vevent7->RRULE = 'FREQ=MONTHLY';
         $tests = array($vevent7, new \DateTime('2012-02-01 15:00:00'), new \DateTime('2012-02-02'), true);
+        // The timezone of timerange in question should also be considered.
+
+        // Added this test to check recurring events that have no instances.
+        $vevent8 = clone $vevent;
+        $vevent8->DTSTART = '20130329T140000';
+        $vevent8->DTEND = '20130329T153000';
+        $vevent8->RRULE = array('FREQ' => 'WEEKLY', 'BYDAY' => array('FR'), 'UNTIL' => '20130412T115959Z');
+        $vevent8->add('EXDATE', '20130405T140000');
+        $vevent8->add('EXDATE', '20130329T140000');
+        $tests = array($vevent8, new \DateTime('2013-03-01'), new \DateTime('2013-04-01'), false);
+
         return $tests;
 
     }

sabre-vobject-3.4.5.tar.gz/tests/VObject/ITip/BrokerDeleteEventTest.php -> sabre-vobject-3.5.3.tar.gz/tests/VObject/ITip/BrokerDeleteEventTest.php Changed

@@ -4,7 +4,7 @@
 
 class BrokerDeleteEventTest extends BrokerTester {
 
-    function testOrganizerDelete() {
+    function testOrganizerDeleteWithDtend() {
 
         $oldMessage = <<<ICS
 BEGIN:VCALENDAR
@@ -17,6 +17,7 @@
 ATTENDEE;CN=One:mailto:one@example.org
 ATTENDEE;CN=Two:mailto:two@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS;
@@ -46,6 +47,7 @@
 SEQUENCE:2
 SUMMARY:foo
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 ORGANIZER;CN=Strunk:mailto:strunk@example.org
 ATTENDEE;CN=One:mailto:one@example.org
 END:VEVENT
@@ -72,6 +74,7 @@
 SEQUENCE:2
 SUMMARY:foo
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 ORGANIZER;CN=Strunk:mailto:strunk@example.org
 ATTENDEE;CN=Two:mailto:two@example.org
 END:VEVENT
@@ -85,7 +88,7 @@
 
     }
 
-    function testAttendeeDelete() {
+    function testOrganizerDeleteWithDuration() {
 
         $oldMessage = <<<ICS
 BEGIN:VCALENDAR
@@ -98,6 +101,148 @@
 ATTENDEE;CN=One:mailto:one@example.org
 ATTENDEE;CN=Two:mailto:two@example.org
 DTSTART:20140716T120000Z
+DURATION:PT1H
+END:VEVENT
+END:VCALENDAR
+ICS;
+
+
+        $newMessage = null;
+
+        $version = \Sabre\VObject\Version::VERSION;
+
+        $expected = array(
+            array(
+                'uid'           => 'foobar',
+                'method'        => 'CANCEL',
+                'component'     => 'VEVENT',
+                'sender'        => 'mailto:strunk@example.org',
+                'senderName'    => 'Strunk',
+                'recipient'     => 'mailto:one@example.org',
+                'recipientName' => 'One',
+                'message'       => <<<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Sabre//Sabre VObject $version//EN
+CALSCALE:GREGORIAN
+METHOD:CANCEL
+BEGIN:VEVENT
+UID:foobar
+SEQUENCE:2
+SUMMARY:foo
+DTSTART:20140716T120000Z
+DURATION:PT1H
+ORGANIZER;CN=Strunk:mailto:strunk@example.org
+ATTENDEE;CN=One:mailto:one@example.org
+END:VEVENT
+END:VCALENDAR
+ICS
+            ),
+
+            array(
+                'uid'           => 'foobar',
+                'method'        => 'CANCEL',
+                'component'     => 'VEVENT',
+                'sender'        => 'mailto:strunk@example.org',
+                'senderName'    => 'Strunk',
+                'recipient'     => 'mailto:two@example.org',
+                'recipientName' => 'Two',
+                'message'       => <<<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Sabre//Sabre VObject $version//EN
+CALSCALE:GREGORIAN
+METHOD:CANCEL
+BEGIN:VEVENT
+UID:foobar
+SEQUENCE:2
+SUMMARY:foo
+DTSTART:20140716T120000Z
+DURATION:PT1H
+ORGANIZER;CN=Strunk:mailto:strunk@example.org
+ATTENDEE;CN=Two:mailto:two@example.org
+END:VEVENT
+END:VCALENDAR
+ICS
+
+            ),
+        );
+
+        $result = $this->parse($oldMessage, $newMessage, $expected, 'mailto:strunk@example.org');
+
+    }
+
+    function testAttendeeDeleteWithDtend() {
+
+        $oldMessage = <<<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+BEGIN:VEVENT
+UID:foobar
+SEQUENCE:1
+SUMMARY:foo
+ORGANIZER;CN=Strunk:mailto:strunk@example.org
+ATTENDEE;CN=One:mailto:one@example.org
+ATTENDEE;CN=Two:mailto:two@example.org
+DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
+END:VEVENT
+END:VCALENDAR
+ICS;
+
+
+        $newMessage = null;
+
+        $version = \Sabre\VObject\Version::VERSION;
+
+        $expected = array(
+            array(
+                'uid'           => 'foobar',
+                'method'        => 'REPLY',
+                'component'     => 'VEVENT',
+                'sender'        => 'mailto:one@example.org',
+                'senderName'    => 'One',
+                'recipient'     => 'mailto:strunk@example.org',
+                'recipientName' => 'Strunk',
+                'message'       => <<<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Sabre//Sabre VObject $version//EN
+CALSCALE:GREGORIAN
+METHOD:REPLY
+BEGIN:VEVENT
+UID:foobar
+SEQUENCE:1
+DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
+SUMMARY:foo
+ORGANIZER;CN=Strunk:mailto:strunk@example.org
+ATTENDEE;PARTSTAT=DECLINED;CN=One:mailto:one@example.org
+END:VEVENT
+END:VCALENDAR
+ICS
+            ),
+        );
+
+        $result = $this->parse($oldMessage, $newMessage, $expected, 'mailto:one@example.org');
+
+
+    }
+
+    function testAttendeeDeleteWithDuration() {
+
+        $oldMessage = <<<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+BEGIN:VEVENT
+UID:foobar
+SEQUENCE:1
+SUMMARY:foo
+ORGANIZER;CN=Strunk:mailto:strunk@example.org
+ATTENDEE;CN=One:mailto:one@example.org
+ATTENDEE;CN=Two:mailto:two@example.org
+DTSTART:20140716T120000Z
+DURATION:PT1H
 END:VEVENT
 END:VCALENDAR
 ICS;
@@ -126,6 +271,7 @@
 UID:foobar
 SEQUENCE:1
 DTSTART:20140716T120000Z
+DURATION:PT1H
 SUMMARY:foo
 ORGANIZER;CN=Strunk:mailto:strunk@example.org
 ATTENDEE;PARTSTAT=DECLINED;CN=One:mailto:one@example.org
@@ -153,6 +299,7 @@

sabre-vobject-3.4.5.tar.gz/tests/VObject/ITip/BrokerNewEventTest.php -> sabre-vobject-3.5.3.tar.gz/tests/VObject/ITip/BrokerNewEventTest.php Changed

@@ -11,6 +11,7 @@
 BEGIN:VEVENT
 UID:foobar
 DTSTART:20140811T220000Z
+DTEND:20140811T230000Z
 END:VEVENT
 END:VCALENDAR
 ICS;
@@ -41,6 +42,7 @@
 BEGIN:VEVENT
 UID:foobar
 DTSTART:20140811T220000Z
+DTEND:20140811T230000Z
 ORGANIZER;CN=Strunk:mailto:strunk@example.org
 ATTENDEE;CN=White:mailto:white@example.org
 END:VEVENT
@@ -57,6 +59,7 @@
 BEGIN:VEVENT
 UID:foobar
 DTSTART:20140811T220000Z
+DTEND:20140811T230000Z
 ORGANIZER;CN=Strunk:mailto:strunk@example.org
 ATTENDEE;CN=White;PARTSTAT=NEEDS-ACTION:mailto:white@example.org
 END:VEVENT
@@ -142,6 +145,7 @@
 ATTENDEE;CN=One:mailto:one@example.org
 ATTENDEE;CN=Two:mailto:two@example.org
 DTSTART:20140716T120000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY
 EXDATE:20140717T120000Z
 END:VEVENT
@@ -152,6 +156,7 @@
 ATTENDEE;CN=Two:mailto:two@example.org
 ATTENDEE;CN=Three:mailto:three@example.org
 DTSTART:20140718T120000Z
+DURATION:PT1H
 END:VEVENT
 END:VCALENDAR
 ICS;
@@ -179,6 +184,7 @@
 ATTENDEE;CN=One;PARTSTAT=NEEDS-ACTION:mailto:one@example.org
 ATTENDEE;CN=Two;PARTSTAT=NEEDS-ACTION:mailto:two@example.org
 DTSTART:20140716T120000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY
 EXDATE:20140717T120000Z,20140718T120000Z
 END:VEVENT
@@ -206,6 +212,7 @@
 ATTENDEE;CN=One;PARTSTAT=NEEDS-ACTION:mailto:one@example.org
 ATTENDEE;CN=Two;PARTSTAT=NEEDS-ACTION:mailto:two@example.org
 DTSTART:20140716T120000Z
+DURATION:PT1H
 RRULE:FREQ=DAILY
 EXDATE:20140717T120000Z
 END:VEVENT
@@ -216,6 +223,7 @@
 ATTENDEE;CN=Two:mailto:two@example.org
 ATTENDEE;CN=Three:mailto:three@example.org
 DTSTART:20140718T120000Z
+DURATION:PT1H
 END:VEVENT
 END:VCALENDAR
 ICS
@@ -242,6 +250,7 @@
 ATTENDEE;CN=Two:mailto:two@example.org
 ATTENDEE;CN=Three:mailto:three@example.org
 DTSTART:20140718T120000Z
+DURATION:PT1H
 END:VEVENT
 END:VCALENDAR
 ICS
@@ -266,6 +275,7 @@
 ATTENDEE;CN=One:mailto:one@example.org
 ATTENDEE;CN=Two:mailto:two@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 RRULE:FREQ=DAILY
 END:VEVENT
 BEGIN:VEVENT
@@ -275,6 +285,7 @@
 ATTENDEE;CN=Two:mailto:two@example.org
 ATTENDEE;CN=Three:mailto:three@example.org
 DTSTART:20140718T120000Z
+DTEND:20140718T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS;
@@ -302,6 +313,7 @@
 ATTENDEE;CN=One;PARTSTAT=NEEDS-ACTION:mailto:one@example.org
 ATTENDEE;CN=Two;PARTSTAT=NEEDS-ACTION:mailto:two@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 RRULE:FREQ=DAILY
 EXDATE:20140718T120000Z
 END:VEVENT
@@ -329,6 +341,7 @@
 ATTENDEE;CN=One;PARTSTAT=NEEDS-ACTION:mailto:one@example.org
 ATTENDEE;CN=Two;PARTSTAT=NEEDS-ACTION:mailto:two@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 RRULE:FREQ=DAILY
 END:VEVENT
 BEGIN:VEVENT
@@ -338,6 +351,7 @@
 ATTENDEE;CN=Two:mailto:two@example.org
 ATTENDEE;CN=Three:mailto:three@example.org
 DTSTART:20140718T120000Z
+DTEND:20140718T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS
@@ -364,6 +378,7 @@
 ATTENDEE;CN=Two:mailto:two@example.org
 ATTENDEE;CN=Three:mailto:three@example.org
 DTSTART:20140718T120000Z
+DTEND:20140718T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS
@@ -383,6 +398,7 @@
 BEGIN:VEVENT
 UID:foobar
 DTSTART:20140811T220000Z
+DTEND:20140811T230000Z
 ORGANIZER;CN=Strunk:mailto:strunk@example.org
 ATTENDEE;CN=White;SCHEDULE-AGENT=CLIENT:mailto:white@example.org
 END:VEVENT
@@ -410,6 +426,7 @@
 ATTENDEE;CN=One:mailto:one@example.org
 ATTENDEE;CN=Two:mailto:two@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 RRULE:FREQ=DAILY
 END:VEVENT
 BEGIN:VEVENT
@@ -419,6 +436,7 @@
 ATTENDEE;CN=Two:mailto:two@example.org
 ATTENDEE;CN=Three:mailto:three@example.org
 DTSTART:20140718T120000Z
+DTEND:20140718T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS;
@@ -443,6 +461,7 @@
 ATTENDEE;CN=One:mailto:one@example.org
 ATTENDEE;CN=Two:mailto:two@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 RRULE:FREQ=DAILY
 END:VEVENT
 BEGIN:VEVENT
@@ -452,6 +471,7 @@
 ATTENDEE;CN=Two:mailto:two@example.org
 ATTENDEE;CN=Three:mailto:three@example.org
 DTSTART:20140718T120000Z
+DTEND:20140718T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS;
@@ -467,6 +487,7 @@
 BEGIN:VEVENT
 UID:foobar
 DTSTART:20140811T220000Z
+DTEND:20140811T230000Z
 ATTENDEE;CN=Two:mailto:two@example.org
 END:VEVENT
 END:VCALENDAR

sabre-vobject-3.4.5.tar.gz/tests/VObject/ITip/BrokerProcessReplyTest.php -> sabre-vobject-3.5.3.tar.gz/tests/VObject/ITip/BrokerProcessReplyTest.php Changed

@@ -185,6 +185,7 @@
 UID:foobar
 RRULE:FREQ=DAILY
 DTSTART:20140724T000000Z
+DTEND:20140724T010000Z
 ATTENDEE:mailto:foo@example.org
 ORGANIZER:mailto:bar@example.org
 END:VEVENT
@@ -199,6 +200,7 @@
 UID:foobar
 RRULE:FREQ=DAILY
 DTSTART:20140724T000000Z
+DTEND:20140724T010000Z
 ATTENDEE:mailto:foo@example.org
 ORGANIZER:mailto:bar@example.org
 END:VEVENT
@@ -206,6 +208,7 @@
 SEQUENCE:2
 UID:foobar
 DTSTART:20140725T000000Z
+DTEND:20140725T010000Z
 ATTENDEE;PARTSTAT=ACCEPTED:mailto:foo@example.org
 ORGANIZER:mailto:bar@example.org
 RECURRENCE-ID:20140725T000000Z
@@ -243,6 +246,7 @@
 UID:foobar
 RRULE:FREQ=DAILY
 DTSTART;TZID=America/Toronto:20140724T000000
+DTEND;TZID=America/Toronto:20140724T010000
 ATTENDEE:mailto:foo@example.org
 ORGANIZER:mailto:bar@example.org
 END:VEVENT
@@ -257,6 +261,7 @@
 UID:foobar
 RRULE:FREQ=DAILY
 DTSTART;TZID=America/Toronto:20140724T000000
+DTEND;TZID=America/Toronto:20140724T010000
 ATTENDEE:mailto:foo@example.org
 ORGANIZER:mailto:bar@example.org
 END:VEVENT
@@ -264,6 +269,7 @@
 SEQUENCE:2
 UID:foobar
 DTSTART;TZID=America/Toronto:20140725T000000
+DTEND;TZID=America/Toronto:20140725T010000
 ATTENDEE;PARTSTAT=ACCEPTED:mailto:foo@example.org
 ORGANIZER:mailto:bar@example.org
 RECURRENCE-ID;TZID=America/Toronto:20140725T000000
@@ -304,6 +310,7 @@
 UID:foobar
 RRULE:FREQ=DAILY
 DTSTART:20140724T000000Z
+DTEND:20140724T010000Z
 ORGANIZER:mailto:bar@example.org
 END:VEVENT
 END:VCALENDAR
@@ -317,12 +324,14 @@
 UID:foobar
 RRULE:FREQ=DAILY
 DTSTART:20140724T000000Z
+DTEND:20140724T010000Z
 ORGANIZER:mailto:bar@example.org
 END:VEVENT
 BEGIN:VEVENT
 SEQUENCE:2
 UID:foobar
 DTSTART:20140725T000000Z
+DTEND:20140725T010000Z
 ORGANIZER:mailto:bar@example.org
 RECURRENCE-ID:20140725T000000Z
 ATTENDEE;PARTSTAT=ACCEPTED;CN=Crasher!:mailto:crasher@example.org
@@ -365,6 +374,7 @@
 UID:foobar
 RRULE:FREQ=DAILY
 DTSTART:20140724T000000Z
+DTEND:20140724T010000Z
 RECURRENCE-ID:20140724T000000Z
 ORGANIZER:mailto:bar@example.org
 END:VEVENT
@@ -422,4 +432,65 @@
 
     }
 
+    function testReplyNewExceptionFirstOccurence() {
+
+        // This is a reply to 1 instance of a recurring event. This should
+        // automatically create an exception.
+        $itip = <<<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+METHOD:REPLY
+BEGIN:VEVENT
+ATTENDEE;PARTSTAT=ACCEPTED:mailto:foo@example.org
+ORGANIZER:mailto:bar@example.org
+SEQUENCE:2
+RECURRENCE-ID:20140724T000000Z
+UID:foobar
+END:VEVENT
+END:VCALENDAR
+ICS;
+
+        $old = <<<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+BEGIN:VEVENT
+SEQUENCE:2
+UID:foobar
+RRULE:FREQ=DAILY
+DTSTART:20140724T000000Z
+DTEND:20140724T010000Z
+ATTENDEE:mailto:foo@example.org
+ORGANIZER:mailto:bar@example.org
+END:VEVENT
+END:VCALENDAR
+ICS;
+
+        $expected = <<<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+BEGIN:VEVENT
+SEQUENCE:2
+UID:foobar
+RRULE:FREQ=DAILY
+DTSTART:20140724T000000Z
+DTEND:20140724T010000Z
+ATTENDEE:mailto:foo@example.org
+ORGANIZER:mailto:bar@example.org
+END:VEVENT
+BEGIN:VEVENT
+SEQUENCE:2
+UID:foobar
+DTSTART:20140724T000000Z
+DTEND:20140724T010000Z
+ATTENDEE;PARTSTAT=ACCEPTED:mailto:foo@example.org
+ORGANIZER:mailto:bar@example.org
+RECURRENCE-ID:20140724T000000Z
+END:VEVENT
+END:VCALENDAR
+ICS;
+
+        $result = $this->process($itip, $old, $expected);
+
+    }
+
 }

sabre-vobject-3.4.5.tar.gz/tests/VObject/ITip/BrokerTester.php -> sabre-vobject-3.5.3.tar.gz/tests/VObject/ITip/BrokerTester.php Changed

sabre-vobject-3.5.3.tar.gz/tests/VObject/ITip/BrokerTimezoneInParseEventInfoWithoutMasterTest.php Added

@@ -0,0 +1,77 @@
+<?php
+
+namespace Sabre\VObject\ITip;
+
+use Sabre\VObject\Reader;
+
+class BrokerTimezoneInParseEventInfoWithoutMasterTest extends \PHPUnit_Framework_TestCase {
+
+    function testTimezoneInParseEventInfoWithoutMaster()
+    {
+        $calendar = <<<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//Mac OS X 10.9.5//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:Europe/Minsk
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0200
+RRULE:FREQ=YEARLY;UNTIL=20100328T000000Z;BYMONTH=3;BYDAY=-1SU
+DTSTART:19930328T020000
+TZNAME:GMT+3
+TZOFFSETTO:+0300
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+DTSTART:20110327T020000
+TZNAME:GMT+3
+TZOFFSETTO:+0300
+RDATE:20110327T020000
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20160331T163031Z
+UID:B9301437-417C-4136-8DB3-8D1555863791
+DTEND;TZID=Europe/Minsk:20160405T100000
+TRANSP:OPAQUE
+ATTENDEE;CN=User Invitee;CUTYPE=INDIVIDUAL;EMAIL=invitee@test.com;PARTSTAT=
+ ACCEPTED;ROLE=REQ-PARTICIPANT:mailto:invitee@test.com
+ATTENDEE;CN=User Organizer;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:organ
+ izer@test.com
+SUMMARY:Event title
+DTSTART;TZID=Europe/Minsk:20160405T090000
+DTSTAMP:20160331T164108Z
+ORGANIZER;CN=User Organizer:mailto:organizer@test.com
+SEQUENCE:6
+RECURRENCE-ID;TZID=Europe/Minsk:20160405T090000
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20160331T163031Z
+UID:B9301437-417C-4136-8DB3-8D1555863791
+DTEND;TZID=Europe/Minsk:20160406T100000
+TRANSP:OPAQUE
+ATTENDEE;CN=User Invitee;CUTYPE=INDIVIDUAL;EMAIL=invitee@test.com;PARTSTAT=
+ ACCEPTED;ROLE=REQ-PARTICIPANT:mailto:invitee@test.com
+ATTENDEE;CN=User Organizer;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:organ
+ izer@test.com
+SUMMARY:Event title
+DTSTART;TZID=Europe/Minsk:20160406T090000
+DTSTAMP:20160331T165845Z
+ORGANIZER;CN=User Organizer:mailto:organizer@test.com
+SEQUENCE:6
+RECURRENCE-ID;TZID=Europe/Minsk:20160406T090000
+END:VEVENT
+END:VCALENDAR
+ICS;
+
+        $calendar = Reader::read($calendar);
+        $broker = new Broker();
+
+        $reflectionMethod = new \ReflectionMethod($broker, 'parseEventInfo');
+        $reflectionMethod->setAccessible(true);
+        $data = $reflectionMethod->invoke($broker, $calendar);
+        $this->assertInstanceOf('DateTimeZone', $data'timezone');
+        $this->assertEquals($data'timezone'->getName(), 'Europe/Minsk');
+    }
+}

sabre-vobject-3.4.5.tar.gz/tests/VObject/ITip/BrokerUpdateEventTest.php -> sabre-vobject-3.5.3.tar.gz/tests/VObject/ITip/BrokerUpdateEventTest.php Changed

@@ -18,6 +18,7 @@
 ATTENDEE;CN=One:mailto:one@example.org
 ATTENDEE;CN=Two:mailto:two@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS;
@@ -35,6 +36,7 @@
 ATTENDEE;CN=Two:mailto:two@example.org
 ATTENDEE;CN=Three:mailto:three@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS;
@@ -62,6 +64,7 @@
 SEQUENCE:2
 SUMMARY:foo
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 ORGANIZER;CN=Strunk:mailto:strunk@example.org
 ATTENDEE;CN=One:mailto:one@example.org
 END:VEVENT
@@ -93,6 +96,7 @@
 ATTENDEE;CN=Two;PARTSTAT=NEEDS-ACTION:mailto:two@example.org
 ATTENDEE;CN=Three;PARTSTAT=NEEDS-ACTION:mailto:three@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS
@@ -122,6 +126,7 @@
 ATTENDEE;CN=Two;PARTSTAT=NEEDS-ACTION:mailto:two@example.org
 ATTENDEE;CN=Three;PARTSTAT=NEEDS-ACTION:mailto:three@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS
@@ -142,6 +147,7 @@
 UID:foobar
 SEQUENCE:1
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS;
@@ -156,6 +162,7 @@
 ORGANIZER;CN=Strunk:mailto:strunk@example.org
 ATTENDEE;CN=One:mailto:one@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS;
@@ -183,6 +190,7 @@
 ORGANIZER;CN=Strunk:mailto:strunk@example.org
 ATTENDEE;CN=One;PARTSTAT=NEEDS-ACTION:mailto:one@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS
@@ -206,6 +214,7 @@
 ORGANIZER;CN=Strunk:mailto:strunk@example.org
 ATTENDEE;CN=One:mailto:one@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS;
@@ -218,6 +227,7 @@
 UID:foobar
 SEQUENCE:1
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS;
@@ -239,6 +249,7 @@
 UID:foobar
 SEQUENCE:1
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 ORGANIZER;CN=Strunk:mailto:strunk@example.org
 ATTENDEE;CN=One:mailto:one@example.org
 END:VEVENT
@@ -262,6 +273,7 @@
 UID:foobar
 SEQUENCE:1
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS;
@@ -274,6 +286,7 @@
 UID:foobar
 SEQUENCE:2
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS;
@@ -296,6 +309,7 @@
 ORGANIZER;CN=Strunk:mailto:strunk@example.org
 ATTENDEE;CN=One:mailto:one@example.org
 DTSTART;TZID=America/Toronto:20140716T120000
+DTEND;TZID=America/Toronto:20140716T130000
 RRULE:FREQ=WEEKLY
 END:VEVENT
 END:VCALENDAR
@@ -311,6 +325,7 @@
 ORGANIZER;CN=Strunk:mailto:strunk@example.org
 ATTENDEE;CN=One:mailto:one@example.org
 DTSTART;TZID=America/Toronto:20140716T120000
+DTEND;TZID=America/Toronto:20140716T130000
 RRULE:FREQ=WEEKLY
 EXDATE;TZID=America/Toronto:20140724T120000
 END:VEVENT
@@ -340,6 +355,7 @@
 ORGANIZER;CN=Strunk:mailto:strunk@example.org
 ATTENDEE;CN=One;PARTSTAT=NEEDS-ACTION:mailto:one@example.org
 DTSTART;TZID=America/Toronto:20140716T120000
+DTEND;TZID=America/Toronto:20140716T130000
 RRULE:FREQ=WEEKLY
 EXDATE;TZID=America/Toronto:20140724T120000
 END:VEVENT
@@ -373,6 +389,7 @@
 ATTENDEE;CN=One:mailto:one@example.org
 ATTENDEE;CN=Two:mailto:two@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS;
@@ -390,6 +407,7 @@
 ATTENDEE;CN=Two:mailto:two@example.org
 ATTENDEE;CN=Three:mailto:three@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS;
@@ -416,6 +434,7 @@
 UID:foobar
 SEQUENCE:2
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 ORGANIZER;CN=Strunk:mailto:strunk@example.org
 ATTENDEE;CN=One:mailto:one@example.org
 END:VEVENT
@@ -447,6 +466,7 @@
 ATTENDEE;CN=Two;PARTSTAT=NEEDS-ACTION:mailto:two@example.org
 ATTENDEE;CN=Three;PARTSTAT=NEEDS-ACTION:mailto:three@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS
@@ -476,6 +496,7 @@
 ATTENDEE;CN=Two;PARTSTAT=NEEDS-ACTION:mailto:two@example.org
 ATTENDEE;CN=Three;PARTSTAT=NEEDS-ACTION:mailto:three@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS
@@ -499,6 +520,7 @@
 ATTENDEE;CN=Strunk;PARTSTAT=ACCEPTED:mailto:strunk@example.org
 ATTENDEE;CN=One:mailto:one@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS;
@@ -514,6 +536,7 @@
 ATTENDEE;CN=Strunk;PARTSTAT=ACCEPTED:mailto:strunk@example.org
 ATTENDEE;CN=One:mailto:one@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS;
@@ -543,6 +566,7 @@
 ATTENDEE;CN=Strunk;PARTSTAT=ACCEPTED:mailto:strunk@example.org
 ATTENDEE;CN=One;PARTSTAT=NEEDS-ACTION:mailto:one@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS
@@ -567,6 +591,7 @@
 ATTENDEE;CN=Strunk;PARTSTAT=ACCEPTED:mailto:strunk@example.org
 ATTENDEE;CN=One:mailto:one@example.org
 DTSTART:20140716T120000Z
+DTEND:20140716T130000Z
 END:VEVENT
 END:VCALENDAR
 ICS;

sabre-vobject-3.4.5.tar.gz/tests/VObject/Property/FloatTest.php -> sabre-vobject-3.5.3.tar.gz/tests/VObject/Property/FloatTest.php Changed

sabre-vobject-3.4.5.tar.gz/tests/VObject/Recur/EventIterator/ExpandFloatingTimesTest.php -> sabre-vobject-3.5.3.tar.gz/tests/VObject/Recur/EventIterator/ExpandFloatingTimesTest.php Changed

sabre-vobject-3.4.5.tar.gz/tests/VObject/Recur/EventIterator/IncorrectExpandTest.php -> sabre-vobject-3.5.3.tar.gz/tests/VObject/Recur/EventIterator/IncorrectExpandTest.php Changed

sabre-vobject-3.4.5.tar.gz/tests/VObject/Recur/EventIterator/MissingOverriddenTest.php -> sabre-vobject-3.5.3.tar.gz/tests/VObject/Recur/EventIterator/MissingOverriddenTest.php Changed

sabre-vobject-3.5.3.tar.gz/tests/VObject/Recur/EventIterator/SameDateForRecurringEventsTest.php Added

@@ -0,0 +1,56 @@
+<?php
+
+namespace Sabre\VObject\Recur;
+
+use Sabre\VObject\Recur\EventIterator;
+use Sabre\VObject\Reader;
+
+/**
+ * Testing case when overridden recurring events have same start date.
+ *
+ * Class SameDateForRecurringEventsTest
+ */
+class SameDateForRecurringEventsTest extends \PHPUnit_Framework_TestCase
+{
+
+    /**
+     * Checking is all events iterated by EventIterator.
+     */
+    public function testAllEventsArePresentInIterator()
+    {
+        $ics = <<<ICS
+BEGIN:VCALENDAR
+BEGIN:VEVENT
+UID:1
+DTSTART;TZID=Europe/Kiev:20160713T110000
+DTEND;TZID=Europe/Kiev:20160713T113000
+RRULE:FREQ=DAILY;INTERVAL=1;COUNT=3
+END:VEVENT
+BEGIN:VEVENT
+UID:2
+DTSTART;TZID=Europe/Kiev:20160713T110000
+DTEND;TZID=Europe/Kiev:20160713T113000
+RECURRENCE-ID;TZID=Europe/Kiev:20160714T110000
+END:VEVENT
+BEGIN:VEVENT
+UID:3
+DTSTART;TZID=Europe/Kiev:20160713T110000
+DTEND;TZID=Europe/Kiev:20160713T113000
+RECURRENCE-ID;TZID=Europe/Kiev:20160715T110000
+END:VEVENT
+BEGIN:VEVENT
+UID:4
+DTSTART;TZID=Europe/Kiev:20160713T110000
+DTEND;TZID=Europe/Kiev:20160713T113000
+RECURRENCE-ID;TZID=Europe/Kiev:20160716T110000
+END:VEVENT
+END:VCALENDAR
+
+
+ICS;
+        $vCalendar = Reader::read($ics);
+        $eventIterator = new EventIterator($vCalendar->getComponents());
+
+        $this->assertEquals(4, iterator_count($eventIterator), 'in ICS 4 events');
+    }
+}

Changes of Revision 3