[Pkg-owncloud-commits] [php-sabre-vobject] 270/341: Merge branch '3.4'
David Prévot
taffit at moszumanska.debian.org
Tue Aug 11 13:35:55 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository php-sabre-vobject.
commit 7660de779441452652582a25b39d29922fd7d56c
Merge: 57db15e 5c0cf39
Author: Evert Pot <me at evertpot.com>
Date: Tue May 26 09:52:45 2015 -0400
Merge branch '3.4'
.travis.yml | 2 +
CHANGELOG.md | 28 ++++++-
README.md | 13 ++--
lib/ITip/Broker.php | 2 +-
lib/Property.php | 37 +++++++++
lib/Property/ICalendar/DateTime.php | 18 +++--
lib/Property/VCard/Date.php | 12 +++
lib/Recur/RRuleIterator.php | 7 +-
tests/VObject/Component/VAvailabilityTest.php | 4 +-
tests/VObject/ITip/BrokerAttendeeReplyTest.php | 75 ++++++++++++++++++
tests/VObject/ITip/BrokerTester.php | 8 +-
tests/VObject/Property/VCard/DateAndOrTimeTest.php | 12 +++
tests/VObject/PropertyTest.php | 91 +++++++++++++++++-----
.../Recur/EventIterator/ByMonthInDailyTest.php | 5 +-
.../Recur/EventIterator/BySetPosHangTest.php | 61 +++++++++++++++
tests/VObject/Recur/RRuleIteratorTest.php | 15 ++++
16 files changed, 342 insertions(+), 48 deletions(-)
diff --cc .travis.yml
index 2619b1f,28ad160..9c680e9
--- a/.travis.yml
+++ b/.travis.yml
@@@ -1,13 -1,16 +1,15 @@@
language: php
php:
- - 5.3
- - 5.4
- 5.5
- 5.6
+ - 7
- hhvm
matrix:
fast_finish: true
allow_failures:
+ - php: hhvm
+ - php: 7
script:
- phpunit --configuration tests/phpunit.xml
diff --cc CHANGELOG.md
index 8482e05,b884d0e..171aae7
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -1,25 -1,32 +1,51 @@@
ChangeLog
=========
+4.0.0-alpha1
+------------
+
+* sabre/vobject now requires PHP 5.5.
+* #160: Support for xCal! (@Hywan)
+* #192: Support for xCard! (@Hywan)
+* #186: Fixing conversion of `UTC-OFFSET` properties when going back and
+ forward between jCal and iCalendar.
+* Properties, Components and Parameters now implement PHP's `JsonSerializable`
+ interface.
+* #139: We now accept `DateTimeInterface` whereever it accepted `DateTime`
+ before in arguments. This means that either `DateTime` or
+ `DateTimeImmutable` may be used everywhere.
+* #139: We now _always_ return `DateTimeImmutable` from any method. This could
+ potentially have big implications if you manipulate Date objects anywhere.
+* #161: Simplified `ElementList` by extending `ArrayIterator`.
+* Removed `RecurrenceIterator` (use Recur\EventIterator instead).
+
- 3.4.0 (2015-??-??)
++
+ 3.4.3 (2015-05-19)
+ ------------------
+
+ * #219: Corrected validation of `EXDATE` properties with more than one value.
+ * #212: `BYSETPOS` with values below `-1` was broken and could cause infinite
+ loops.
+ * #211: Fix `BYDAY=-5TH` in recurrence iterator. (@lindquist)
+ * #216: `ENCODING` parameter is now validated for all document types.
+ * #217: Initializing vCard `DATE` objects with a PHP DateTime object will now
+ work correctly. (@thomascube)
+
+
+ 3.4.2 (2015-02-25)
+ ------------------
+
+ * #210: iTip: Replying to an event without a master event was broken.
+
+
+ 3.4.1 (2015-02-24)
+ ------------------
+
+ * A minor change to ensure that unittests work correctly in the sabre/dav
+ test-suite.
+
+
+ 3.4.0 (2015-02-23)
------------------
* #196: Made parsing recurrence rules a lot faster on big calendars.
diff --cc lib/Property/ICalendar/DateTime.php
index 1a8ca18,160eda4..804d7a9
--- a/lib/Property/ICalendar/DateTime.php
+++ b/lib/Property/ICalendar/DateTime.php
@@@ -368,18 -365,20 +368,20 @@@ class DateTime extends Property
$messages = parent::validate($options);
$valueType = $this->getValueType();
- $value = $this->getValue();
+ $values = $this->getParts();
try {
- switch($valueType) {
- case 'DATE' :
- DateTimeParser::parseDate($value);
- break;
- case 'DATE-TIME' :
- DateTimeParser::parseDateTime($value);
- break;
+ foreach($values as $value) {
+ switch($valueType) {
+ case 'DATE' :
- $foo = DateTimeParser::parseDate($value);
++ DateTimeParser::parseDate($value);
+ break;
+ case 'DATE-TIME' :
- $foo = DateTimeParser::parseDateTime($value);
++ DateTimeParser::parseDateTime($value);
+ break;
+ }
}
} catch (\LogicException $e) {
- $messages[] = array(
+ $messages[] = [
'level' => 3,
'message' => 'The supplied value (' . $value . ') is not a correct ' . $valueType,
'node' => $this,
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git
More information about the Pkg-owncloud-commits
mailing list