[Pkg-owncloud-commits] [php-sabre-vobject] 54/65: Merge branch '3.3' into recur-optimize

[David Prévot]

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 323c1cc65ee21a30593204c398c3e30a3a675b1e
Merge: 28210d7 c82e2c4
Author: Evert Pot <me at evertpot.com>
Date:   Tue Feb 17 22:39:23 2015 -0500

    Merge branch '3.3' into recur-optimize
    
    Conflicts:
    	lib/Component/VCalendar.php

 ChangeLog.md                                       |   9 +
 lib/Component/Available.php                        | 108 ++++++
 lib/Component/VAlarm.php                           |   1 +
 lib/Component/VAvailability.php                    |  99 ++++++
 lib/Component/VCalendar.php                        |  19 +-
 lib/Component/VCard.php                            |   1 +
 lib/Component/VEvent.php                           |   2 +-
 lib/Component/VFreeBusy.php                        |   1 +
 lib/Component/VJournal.php                         |   1 +
 lib/Component/VTimeZone.php                        |   1 +
 lib/Component/VTodo.php                            |   1 +
 lib/DateTimeParser.php                             |   5 +-
 lib/FreeBusyGenerator.php                          |  14 +-
 lib/ITip/Broker.php                                |  20 +-
 lib/timezonedata/windowszones.php                  |   6 +-
 tests/VObject/Component/VAlarmTest.php             |   2 +-
 tests/VObject/Component/VAvailabilityTest.php      | 387 +++++++++++++++++++++
 tests/VObject/DateTimeParserTest.php               |  30 +-
 tests/VObject/FreeBusyGeneratorTest.php            |  18 +
 tests/VObject/ITip/BrokerUpdateEventTest.php       |  91 +++++
 .../EventIterator/ExpandFloatingTimesTest.php      |   4 +-
 tests/VObject/TimeZoneUtilTest.php                 |  13 +-
 22 files changed, 812 insertions(+), 21 deletions(-)

diff --cc lib/Component/VCalendar.php
index 156899b,ada9399..ade1ad0
--- a/lib/Component/VCalendar.php
+++ b/lib/Component/VCalendar.php
@@@ -494,26 -492,4 +500,27 @@@ class VCalendar extends VObject\Documen
  
      }
  
 +    /**
 +     * Returns all components with a specific UID value.
 +     *
 +     * @return array
 +     */
 +    function getByUID($uid) {
 +
 +        return array_filter($this->children, function($item) use ($uid) {
 +
 +            if (!$item instanceof Component) {
 +                return false;
 +            }
 +            if (!$itemUid = $item->select('UID')) {
 +                return false;
 +            }
 +            $itemUid = current($itemUid)->getValue();
 +            return $uid === $itemUid;
 +
 +        });
 +
 +    }
 +
++
  }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git