[Pkg-owncloud-commits] [php-sabre-vobject] 323/341: Merge branch 'master' into vavailablity-calculation

[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 8973b485c50efe4aaf22929b00754ebecd895950
Merge: ec248d6 5a9c626
Author: Evert Pot <me at evertpot.com>
Date:   Thu Jul 16 17:48:22 2015 -0400

    Merge branch 'master' into vavailablity-calculation

 .travis.yml                                    |   1 -
 CHANGELOG.md                                   |   5 +-
 composer.json                                  |   2 +-
 lib/Component.php                              |   5 +-
 lib/Component/VCalendar.php                    |  14 +-
 lib/Component/VCard.php                        |   4 +-
 lib/FreeBusyGenerator.php                      |   2 +-
 lib/Parser/XML.php                             |   6 +-
 lib/Property/{Float.php => FloatValue.php}     |   2 +-
 lib/Property/{Integer.php => IntegerValue.php} |   2 +-
 lib/Recur/RRuleIterator.php                    |  24 +-
 lib/Splitter/ICalendar.php                     |   2 +-
 lib/Splitter/SplitterInterface.php             |   2 +-
 lib/Splitter/VCard.php                         |   2 +-
 tests/VObject/Parser/XmlTest.php               | 898 ++++++++++++-------------
 tests/VObject/Property/FloatTest.php           |   2 +-
 16 files changed, 495 insertions(+), 478 deletions(-)

diff --cc lib/FreeBusyGenerator.php
index 6eba3f8,cb4e39b..fd1ca77
--- a/lib/FreeBusyGenerator.php
+++ b/lib/FreeBusyGenerator.php
@@@ -121,21 -114,9 +121,21 @@@ class FreeBusyGenerator 
      }
  
      /**
 +     * Sets a VAVAILABILITY document.
 +     *
 +     * @param Document $vcalendar
 +     * @return void
 +     */
 +    function setVAvailablility(Document $vcalendar) {
 +
 +        $this->vavailability = $vcalendar;
 +
 +    }
 +
 +    /**
       * Sets the input objects.
       *
-      * You must either specify a valendar object as a strong, or as the parse
+      * You must either specify a valendar object as a string, or as the parse
       * Component.
       * It's also possible to specify multiple objects as an array.
       *

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