[Pkg-owncloud-commits] [php-sabre-vobject] 06/19: Merge branch '2.1' into 3.1

David Prévot taffit at moszumanska.debian.org
Sun Jun 15 02:08:54 UTC 2014


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 dbb8ac72231c18a743075679c2776710c6ddbd22
Merge: 79c3062 344a356
Author: Evert Pot <me at evertpot.com>
Date:   Tue Jun 3 14:50:04 2014 -0400

    Merge branch '2.1' into 3.1
    
    Conflicts:
    	.gitignore
    	.travis.yml
    	ChangeLog
    	README.md
    	lib/Sabre/VObject/Component.php
    	lib/Sabre/VObject/Node.php
    	lib/Sabre/VObject/Parameter.php
    	lib/Sabre/VObject/Property.php
    	lib/Sabre/VObject/Property/Compound.php
    	lib/Sabre/VObject/Property/DateTime.php
    	lib/Sabre/VObject/Property/MultiDateTime.php
    	lib/Sabre/VObject/RecurrenceIterator.php
    	lib/Sabre/VObject/Version.php

 .gitignore                                       |  3 +++
 .travis.yml                                      |  1 -
 ChangeLog                                        |  6 ++++--
 LICENSE                                          |  2 +-
 README.md                                        | 11 +++++++----
 composer.json                                    |  2 +-
 lib/Sabre/VObject/Component.php                  |  4 ++--
 lib/Sabre/VObject/Component/VAlarm.php           |  4 ++--
 lib/Sabre/VObject/Component/VCalendar.php        |  4 ++--
 lib/Sabre/VObject/Component/VCard.php            |  4 ++--
 lib/Sabre/VObject/Component/VEvent.php           |  4 ++--
 lib/Sabre/VObject/Component/VFreeBusy.php        |  4 ++--
 lib/Sabre/VObject/Component/VJournal.php         |  4 ++--
 lib/Sabre/VObject/Component/VTodo.php            |  4 ++--
 lib/Sabre/VObject/DateTimeParser.php             |  4 ++--
 lib/Sabre/VObject/Document.php                   |  4 ++--
 lib/Sabre/VObject/ElementList.php                |  4 ++--
 lib/Sabre/VObject/FreeBusyGenerator.php          |  4 ++--
 lib/Sabre/VObject/Node.php                       |  4 ++--
 lib/Sabre/VObject/Parameter.php                  |  4 ++--
 lib/Sabre/VObject/ParseException.php             |  4 ++--
 lib/Sabre/VObject/Property.php                   |  4 ++--
 lib/Sabre/VObject/Reader.php                     |  4 ++--
 lib/Sabre/VObject/RecurrenceIterator.php         |  4 ++--
 lib/Sabre/VObject/Splitter/ICalendar.php         |  4 ++--
 lib/Sabre/VObject/Splitter/SplitterInterface.php |  4 ++--
 lib/Sabre/VObject/Splitter/VCard.php             |  4 ++--
 lib/Sabre/VObject/StringUtil.php                 |  4 ++--
 lib/Sabre/VObject/TimeZoneUtil.php               |  4 ++--
 lib/Sabre/VObject/Version.php                    |  4 ++--
 lib/Sabre/VObject/includes.php                   |  4 ++--
 tests/Sabre/VObject/ParameterTest.php            |  8 ++++++++
 32 files changed, 74 insertions(+), 59 deletions(-)

diff --cc .gitignore
index 1685ed5,bb3f96e..af3672c
--- a/.gitignore
+++ b/.gitignore
@@@ -3,5 -3,5 +3,8 @@@ vendor
  composer.lock
  tests/cov/
  
 +#vim
 +.*.swp
++
+ # OS X
+ .DS_Store
diff --cc .travis.yml
index 83ff82d,bef5ce3..a38ff9a
--- a/.travis.yml
+++ b/.travis.yml
@@@ -3,15 -3,8 +3,14 @@@ php
    - 5.3
    - 5.4
    - 5.5
-   - 5.5.11
    - 5.6
  
 -script: phpunit --configuration tests/phpunit.xml
 +matrix:
 +  allow_failures:
 +    - php: 5.6
 +
 +script:
 +  - phpunit --configuration tests/phpunit.xml
 +  - php bin/vobject -h
  
  before_script: composer install
diff --cc ChangeLog
index 7884eac,26c8fef..b23b7de
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,155 -1,7 +1,157 @@@
 +3.1.4-stable (2014-03-30)
 +	* Fixed: Issue #87: Several compatibility fixes related to timezone
 +	  handling changes in PHP 5.5.10.
 +
 +3.1.3-stable (2013-10-02)
 +	* Fixed: Support from properties from draft-daboo-valarm-extensions-04.
 +	  Issue #56.
 +	* Fixed: Issue #54. Parsing a stream of multiple vcards separated by more
 +	  than one newline. Thanks @Vedmak for the patch.
 +	* Fixed: Serializing vcard 2.1 parameters with no name caused a literal
 +	  '1' to be inserted.
 +	* Added: VCardConverter removed properties that are no longer supported in
 +	  vCard 4.0.
 +	* Added: vCards with a minimum number of values (such as N), but don't
 +	  have that many, are now automatically padded with empty components.
 +	* Added: The vCard validator now also checks for a minimum number of
 +	  components, and has the ability to repair these.
 +	* Added: Some support for vCard 2.1 in the VCard converter, to upgrade to
 +	  vCard 3.0 or 4.0.
 +	* Fixed: Issue 60 Use Document::$componentMap when instantiating the
 +	  top-level VCalendar and VCard components.
 +	* Fixed: Issue 62: Parsing iCalendar parameters with no value.
 +	* Added: --forgiving option to vobject utility.
 +	* Fixed: Compound properties such as ADR were not correctly split up in
 +	  vCard 2.1 quoted printable-encoded properties.
 +	* Fixed: Issue 64: Encoding of binary properties of converted vCards.
 +	  Thanks @DominikTo for the patch.
 +
 +3.1.2-stable (2013-08-13)
 +	* Fixed: Setting correct property group on VCard conversion
 +
 +3.1.1-stable (2013-08-02)
 +	* Fixed: Issue #53. A regression in RecurrenceIterator.
 +
 +3.1.0-stable (2013-07-27)
 +	* Added: bad-ass new cli debugging utility (in bin/vobject).
 +	* Added: jCal and jCard parser.
 +	* Fixed: URI properties should not escape ; and ,.
 +	* Fixed: VCard 4 documents now correctly use URI as a default value-type
 +	  for PHOTO and others. BINARY no longer exists in vCard 4.
 +	* Added: Utility to convert between 2.1, 3.0 and 4.0 vCards.
 +	* Added: You can now add() multiple parameters to a property in one call.
 +	* Added: Parameter::has() for easily checking if a parameter value exists.
 +	* Added: VCard::preferred() to find a preferred email, phone number, etc
 +	  for a contact.
 +	* Changed: All $duration properties are now public.
 +	* Added: A few validators for iCalendar documents.
 +	* Fixed: Issue #50. RecurrenceIterator gives incorrect result when
 +	  exception events are out of order in the iCalendar file.
 +	* Fixed: Issue #48. Overridden events in the recurrence iterator that were
 +	  past the UNTIL date were ignored.
 +	* Added: getDuration for DURATION values such as TRIGGER.
 +	  Thanks to @SimonSimCity.
 +	* Fixed: Issue #52. vCard 2.1 parameters with no name may lose values if
 +	  there's more than 1. Thanks to @Vedmak.
 +
 +3.0.0-stable (2013-06-21)
 +	* Fixed: includes.php file was still broken. Our tool to generate it had
 +	  some bugs.
 +
 +3.0.0-beta4 (2013-06-21)
 +	* Fixed: includes.php was no longer up to date.
 +
 +3.0.0-beta3 (2013-06-17)
 +	* Added: OPTION_FORGIVING now also allows slashes in property names.
 +	* Fixed: DateTimeParser no longer fails on dates with years < 1000
 +	  & > 4999
 +	* Fixed: Issue 36: Workaround for the recurrenceiterator and caldav events
 +	  with a missing base event.
 +	* Fixed: jCard encoding of TIME properties.
 +	* Fixed: jCal encoding of REQUEST-STATUS, GEO and PERIOD values.
 +
 +3.0.0-beta2 (2013-06-10)
 +	* Fixed: Corrected includes.php file.
 +	* Fixed: vCard date-time parser supported extended-format dates as well.
 +	* Changed: Properties have been moved to an ICalendar or VCard directory.
 +	* Fixed: Couldn't parse vCard 3 extended format dates and times.
 +	* Fixed: Couldn't export jCard DATE values correctly.
 +	* Fixed: Recursive loop in ICalendar\DateTime property.
 +
 +3.0.0-beta1 (2013-06-07)
 +	* Added: jsonSerialize() for creating jCal and jCard documents.
 +	* Added: helper method to parse vCard dates and times.
 +	* Added: Specialized classes for FLOAT, LANGUAGE-TAG, TIME, TIMESTAMP,
 +	  DATE-AND-OR-TIME, CAL-ADDRESS, UNKNOWN and UTC-OFFSET properties.
 +	* Removed: CommaSeparatedText property. Now included into Text.
 +	* Fixed: Multiple parameters with the same name are now correctly encoded.
 +	* Fixed: Parameter values containing a comma are now enclosed in
 +	  double-quotes.
 +	* Fixed: Iterating parameter values should now fully work as expected.
 +	* Fixed: Support for vCard 2.1 nameless parameters.
 +	* Changed: $valueMap, $componentMap and $propertyMap now all use
 +	  fully-qualified class names, so they are actually overridable.
 +	* Fixed: Updating DATE-TIME to DATE values now behaves like expected.
 +
 +3.0.0-alpha4 (2013-05-31)
 +	* Added: It's now possible to send parser options to the splitter classes.
 +	* Added: A few tweaks to improve component and property creation.
 +
 +3.0.0-alpha3 (2013-05-13)
 +	* Changed: propertyMap, valueMap and componentMap are now static
 +	  properties.
 +	* Changed: Component::remove() will throw an exception when trying to
 +	  a node that's not a child of said component.
 +	* Added: Splitter objects are now faster, line numbers are accurately
 +	  reported and use less memory.
 +	* Added: MimeDir parser can now continue parsing with the same stream
 +	  buffer.
 +	* Fixed: vobjectvalidate.php is operational again.
 +	* Fixed: \r is properly stripped in text values.
 +	* Fixed: QUOTED-PRINTABLE is now correctly encoded as well as encoded, for
 +	  vCards 2.1.
 +	* Fixed: Parser assumes vCard 2.1, if no version was supplied.
 +
 +3.0.0-alpha2 (2013-05-22)
 +	* Fixed: vCard URL properties were referencing a non-existant class.
 +
 +3.0.0-alpha1 (2013-05-21)
 +	* Fixed: Now correctly dealing with escaping of properties. This solves
 +	  the problem with double-backslashes where they don't belong.
 +	* Added: Easy support for properties with more than one value, using
 +	  setParts and getParts.
 +	* Added: Support for broken 2.1 vCards produced by microsoft.
 +	* Added: Automatically decoding quoted-printable values.
 +	* Added: Automatically decoding base64 values.
 +	* Added: Decoding RFC6868 parameter values (uses ^ as an escape
 +	  character).
 +	* Added: Fancy new MimeDir parser that can also parse streams.
 +	* Added: Automatically mapping many, many properties to a property-class
 +	  with specialized API's.
 +	* Added: remove() method for easily removing properties and sub-components
 +	  components.
 +	* Changed: Components, Properties and Parameters can no longer be created
 +	  with Component::create, Property::create and Parameter::create. They
 +	  must instead be created through the root component. (A VCalendar or
 +	  VCard object).
 +	* Changed: API for DateTime properties has slightly changed.
 +	* Changed: the ->value property is now protected everywhere. Use
 +	  getParts() and getValue() instead.
 +	* BC Break: No support for mac newlines (\r). Never came across these
 +	  anyway.
 +	* Added: add() method to the Property class.
 +	* Added: It's now possible to easy set multi-value properties as arrays.
 +	* Added: When setting date-time properties you can just pass PHP's
 +	  DateTime object.
 +	* Added: New components automatically get a bunch of default properties,
 +	  such as VERSION and CALSCALE.
 +	* Added: You can add new sub-components much quicker with the magic
 +	  setters, and add() method.
 +
- 2.1.4-stable (????-??-??)
- =======
+ 2.1.5-stable (2014-06-03)
+ 	* Fixed: #94: Better parameter escaping.
+ 	* Changed: Documentation cleanups.
+ 
  2.1.4-stable (2014-03-30)
  	* Fixed: Issue #87: Several compatibility fixes related to timezone
  	  handling changes in PHP 5.5.10.
diff --cc README.md
index 009b7e4,dd65edf..4efa1fd
--- a/README.md
+++ b/README.md
@@@ -5,19 -5,9 +5,19 @@@ The VObject library allows you to easil
  and [vCard](https://tools.ietf.org/html/rfc6350) objects using PHP.
  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](http://code.google.com/p/sabredav/), where it has
+ This project is a spin-off from [SabreDAV](http://sabre.io/), where it has
  been used for several years. The VObject library has 100% unittest coverage.
  
 +Build status
 +------------
 +
 +| branch | status |
 +| ------ | ------ |
 +| master | [![Build Status](https://travis-ci.org/fruux/sabre-vobject.png?branch=master)](https://travis-ci.org/fruux/sabre-vobject) |
 +| 2.1    | [![Build Status](https://travis-ci.org/fruux/sabre-vobject.png?branch=2.1)](https://travis-ci.org/fruux/sabre-vobject) |
 +| 2.0    | [![Build Status](https://travis-ci.org/fruux/sabre-vobject.png?branch=2.0)](https://travis-ci.org/fruux/sabre-vobject) |
 +
 +
  Installation
  ------------
  
diff --cc lib/Sabre/VObject/Component.php
index 72428cb,9cdb025..0ee4f19
--- a/lib/Sabre/VObject/Component.php
+++ b/lib/Sabre/VObject/Component.php
@@@ -3,14 -3,15 +3,14 @@@
  namespace Sabre\VObject;
  
  /**
 - * VObject Component
 + * Component
   *
 - * This class represents a VCALENDAR/VCARD component. A component is for example
 - * VEVENT, VTODO and also VCALENDAR. It starts with BEGIN:COMPONENTNAME and
 - * ends with END:COMPONENTNAME
 + * A component represents a group of properties, such as VCALENDAR, VEVENT, or
 + * VCARD.
   *
-  * @copyright Copyright (C) 2007-2013 fruux GmbH. All rights reserved.
 - * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
++ * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
   * @author Evert Pot (http://evertpot.com/)
-  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+  * @license http://sabre.io/license/ Modified BSD License
   */
  class Component extends Node {
  
diff --cc lib/Sabre/VObject/Component/VCard.php
index 69eb8d4,25aa187..816cced
--- a/lib/Sabre/VObject/Component/VCard.php
+++ b/lib/Sabre/VObject/Component/VCard.php
@@@ -11,159 -10,13 +11,159 @@@ us
   * This component represents the BEGIN:VCARD and END:VCARD found in every
   * vcard.
   *
-  * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+  * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
   * @author Evert Pot (http://evertpot.com/)
-  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+  * @license http://sabre.io/license/ Modified BSD License
   */
 -class VCard extends VObject\Component {
 +class VCard extends VObject\Document {
  
 -    static $defaultName = 'VCARD';
 +    /**
 +     * The default name for this component.
 +     *
 +     * This should be 'VCALENDAR' or 'VCARD'.
 +     *
 +     * @var string
 +     */
 +    static public $defaultName = 'VCARD';
 +
 +    /**
 +     * Caching the version number
 +     *
 +     * @var int
 +     */
 +    private $version = null;
 +
 +    /**
 +     * List of value-types, and which classes they map to.
 +     *
 +     * @var array
 +     */
 +    static public $valueMap = array(
 +        'BINARY'           => 'Sabre\\VObject\\Property\\Binary',
 +        'BOOLEAN'          => 'Sabre\\VObject\\Property\\Boolean',
 +        'CONTENT-ID'       => 'Sabre\\VObject\\Property\\FlatText',   // vCard 2.1 only
 +        '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',
 +        'LANGUAGE-TAG'     => 'Sabre\\VObject\\Property\\VCard\\LanguageTag',
 +        'TIMESTAMP'        => 'Sabre\\VObject\\Property\\VCard\\TimeStamp',
 +        'TEXT'             => 'Sabre\\VObject\\Property\\Text',
 +        'TIME'             => 'Sabre\\VObject\\Property\\Time',
 +        'UNKNOWN'          => 'Sabre\\VObject\\Property\\Unknown', // jCard / jCal-only.
 +        'URI'              => 'Sabre\\VObject\\Property\\Uri',
 +        'URL'              => 'Sabre\\VObject\\Property\\Uri', // vCard 2.1 only
 +        'UTC-OFFSET'       => 'Sabre\\VObject\\Property\\UtcOffset',
 +    );
 +
 +    /**
 +     * List of properties, and which classes they map to.
 +     *
 +     * @var array
 +     */
 +    static public $propertyMap = array(
 +
 +        // vCard 2.1 properties and up
 +        'N'       => 'Sabre\\VObject\\Property\\Text',
 +        'FN'      => 'Sabre\\VObject\\Property\\FlatText',
 +        'PHOTO'   => 'Sabre\\VObject\\Property\\Binary', // Todo: we should add a class for Binary values.
 +        'BDAY'    => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime',
 +        'ADR'     => 'Sabre\\VObject\\Property\\Text',
 +        'LABEL'   => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
 +        'TEL'     => 'Sabre\\VObject\\Property\\FlatText',
 +        'EMAIL'   => 'Sabre\\VObject\\Property\\FlatText',
 +        'MAILER'  => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
 +        'GEO'     => 'Sabre\\VObject\\Property\\FlatText',
 +        'TITLE'   => 'Sabre\\VObject\\Property\\FlatText',
 +        'ROLE'    => 'Sabre\\VObject\\Property\\FlatText',
 +        'LOGO'    => 'Sabre\\VObject\\Property\\Binary',
 +        // 'AGENT'   => 'Sabre\\VObject\\Property\\',      // Todo: is an embedded vCard. Probably rare, so
 +                                 // not supported at the moment
 +        'ORG'     => 'Sabre\\VObject\\Property\\Text',
 +        'NOTE'    => 'Sabre\\VObject\\Property\\FlatText',
 +        'REV'     => 'Sabre\\VObject\\Property\\VCard\\TimeStamp',
 +        'SOUND'   => 'Sabre\\VObject\\Property\\FlatText',
 +        'URL'     => 'Sabre\\VObject\\Property\\Uri',
 +        'UID'     => 'Sabre\\VObject\\Property\\FlatText',
 +        'VERSION' => 'Sabre\\VObject\\Property\\FlatText',
 +        'KEY'     => 'Sabre\\VObject\\Property\\FlatText',
 +        'TZ'      => 'Sabre\\VObject\\Property\\Text',
 +
 +        // vCard 3.0 properties
 +        'CATEGORIES'  => 'Sabre\\VObject\\Property\\Text',
 +        'SORT-STRING' => 'Sabre\\VObject\\Property\\FlatText',
 +        'PRODID'      => 'Sabre\\VObject\\Property\\FlatText',
 +        'NICKNAME'    => 'Sabre\\VObject\\Property\\Text',
 +        'CLASS'       => 'Sabre\\VObject\\Property\\FlatText', // Removed in vCard 4.0
 +
 +        // rfc2739 properties
 +        'FBURL'        => 'Sabre\\VObject\\Property\\Uri',
 +        'CAPURI'       => 'Sabre\\VObject\\Property\\Uri',
 +        'CALURI'       => 'Sabre\\VObject\\Property\\Uri',
 +
 +        // rfc4770 properties
 +        'IMPP'         => 'Sabre\\VObject\\Property\\Uri',
 +
 +        // vCard 4.0 properties
 +        'XML'          => 'Sabre\\VObject\\Property\\FlatText',
 +        'ANNIVERSARY'  => 'Sabre\\VObject\\Property\\VCard\\DateAndOrTime',
 +        'CLIENTPIDMAP' => 'Sabre\\VObject\\Property\\Text',
 +        'LANG'         => 'Sabre\\VObject\\Property\\VCard\\LanguageTag',
 +        'GENDER'       => 'Sabre\\VObject\\Property\\Text',
 +        'KIND'         => 'Sabre\\VObject\\Property\\FlatText',
 +
 +    );
 +
 +    /**
 +     * Returns the current document type.
 +     *
 +     * @return void
 +     */
 +    public function getDocumentType() {
 +
 +        if (!$this->version) {
 +            $version = (string)$this->VERSION;
 +            switch($version) {
 +                case '2.1' :
 +                    $this->version = self::VCARD21;
 +                    break;
 +                case '3.0' :
 +                    $this->version = self::VCARD30;
 +                    break;
 +                case '4.0' :
 +                    $this->version = self::VCARD40;
 +                    break;
 +                default :
 +                    $this->version = self::UNKNOWN;
 +                    break;
 +
 +            }
 +        }
 +
 +        return $this->version;
 +
 +    }
 +
 +    /**
 +     * Converts the document to a different vcard version.
 +     *
 +     * Use one of the VCARD constants for the target. This method will return
 +     * a copy of the vcard in the new version.
 +     *
 +     * At the moment the only supported conversion is from 3.0 to 4.0.
 +     *
 +     * If input and output version are identical, a clone is returned.
 +     *
 +     * @param int $target
 +     * @return VCard
 +     */
 +    public function convert($target) {
 +
 +        $converter = new VObject\VCardConverter();
 +        return $converter->convert($this, $target);
 +
 +    }
  
      /**
       * VCards with version 2.1, 3.0 and 4.0 are found.
diff --cc lib/Sabre/VObject/Node.php
index 3260a8c,de389a0..e291b17
--- a/lib/Sabre/VObject/Node.php
+++ b/lib/Sabre/VObject/Node.php
@@@ -3,11 -3,11 +3,11 @@@
  namespace Sabre\VObject;
  
  /**
 - * Base class for all nodes
 + * A node is the root class for every element in an iCalendar of vCard object.
   *
-  * @copyright Copyright (C) 2007-2013 fruux GmbH. All rights reserved.
 - * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
++ * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
   * @author Evert Pot (http://evertpot.com/)
-  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+  * @license http://sabre.io/license/ Modified BSD License
   */
  abstract class Node implements \IteratorAggregate, \ArrayAccess, \Countable {
  
diff --cc lib/Sabre/VObject/Property.php
index d04a05c,2c39d32..120b2d6
--- a/lib/Sabre/VObject/Property.php
+++ b/lib/Sabre/VObject/Property.php
@@@ -3,21 -3,24 +3,21 @@@
  namespace Sabre\VObject;
  
  /**
 - * VObject Property
 + * Property
   *
 - * A property in VObject is usually in the form PARAMNAME:paramValue.
 - * An example is : SUMMARY:Weekly meeting
 + * A property is always in a KEY:VALUE structure, and may optionally contain
 + * parameters.
   *
-  * @copyright Copyright (C) 2007-2013 fruux GmbH. All rights reserved.
 - * Properties can also have parameters:
 - * SUMMARY;LANG=en:Weekly meeting.
 - *
 - * Parameters can be accessed using the ArrayAccess interface.
 - *
 - * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
++ * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
   * @author Evert Pot (http://evertpot.com/)
-  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+  * @license http://sabre.io/license/ Modified BSD License
   */
 -class Property extends Node {
 +abstract class Property extends Node {
  
      /**
 -     * Propertyname
 +     * Property name.
 +     *
 +     * This will contain a string such as DTSTART, SUMMARY, FN.
       *
       * @var string
       */
diff --cc lib/Sabre/VObject/Reader.php
index 33d6260,5830ab4..acb4f44
--- a/lib/Sabre/VObject/Reader.php
+++ b/lib/Sabre/VObject/Reader.php
@@@ -3,14 -3,16 +3,14 @@@
  namespace Sabre\VObject;
  
  /**
 - * VCALENDAR/VCARD reader
 + * iCalendar/vCard/jCal/jCard reader object.
   *
 - * This class reads the vobject file, and returns a full element tree.
 - *
 - * TODO: this class currently completely works 'statically'. This is pointless,
 - * and defeats OOP principals. Needs refactoring in a future version.
 + * This object provides a few (static) convenience methods to quickly access
 + * the parsers.
   *
-  * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+  * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
   * @author Evert Pot (http://evertpot.com/)
-  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+  * @license http://sabre.io/license/ Modified BSD License
   */
  class Reader {
  
diff --cc lib/Sabre/VObject/RecurrenceIterator.php
index 9efbc1d,947f6d0..561571c
--- a/lib/Sabre/VObject/RecurrenceIterator.php
+++ b/lib/Sabre/VObject/RecurrenceIterator.php
@@@ -41,11 -41,9 +41,11 @@@ namespace Sabre\VObject
   * you may get unexpected results. The effect is that in some applications the
   * specified recurrence may look incorrect, or is missing.
   *
 + * The recurrence iterator also does not yet support THISANDFUTURE.
 + *
-  * @copyright Copyright (C) 2007-2013 fruux GmbH (https://fruux.com/).
+  * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
   * @author Evert Pot (http://evertpot.com/)
-  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+  * @license http://sabre.io/license/ Modified BSD License
   */
  class RecurrenceIterator implements \Iterator {
  

-- 
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