[Pkg-owncloud-commits] [php-sabredav] 43/163: Merge branch '1.8'

David Prévot taffit at moszumanska.debian.org
Tue May 20 18:54:52 UTC 2014


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to annotated tag upstream/2.0.0_beta1
in repository php-sabredav.

commit 381f02db2624f1dbd03725d313dd6987cc2c406e
Merge: 3b8ce85 0ed8279
Author: Evert Pot <evert at rooftopsolutions.nl>
Date:   Mon Apr 7 01:08:57 2014 -0400

    Merge branch '1.8'
    
    Conflicts:
    	lib/Sabre/CalDAV/Version.php
    	lib/Sabre/CardDAV/Version.php
    	lib/Sabre/DAV/URLUtil.php
    	lib/Sabre/DAVACL/Version.php
    	lib/Sabre/HTTP/AWSAuth.php
    	lib/Sabre/HTTP/AbstractAuth.php
    	lib/Sabre/HTTP/BasicAuth.php
    	lib/Sabre/HTTP/DigestAuth.php
    	lib/Sabre/HTTP/Request.php
    	lib/Sabre/HTTP/Response.php
    	lib/Sabre/HTTP/Util.php
    	lib/Sabre/HTTP/Version.php

 lib/Sabre/CalDAV/Backend/AbstractBackend.php                 | 2 +-
 lib/Sabre/CalDAV/Backend/BackendInterface.php                | 2 +-
 lib/Sabre/CalDAV/Backend/NotificationSupport.php             | 2 +-
 lib/Sabre/CalDAV/Backend/PDO.php                             | 2 +-
 lib/Sabre/CalDAV/Backend/SharingSupport.php                  | 2 +-
 lib/Sabre/CalDAV/Calendar.php                                | 2 +-
 lib/Sabre/CalDAV/CalendarObject.php                          | 2 +-
 lib/Sabre/CalDAV/CalendarQueryParser.php                     | 2 +-
 lib/Sabre/CalDAV/CalendarQueryValidator.php                  | 2 +-
 lib/Sabre/CalDAV/CalendarRootNode.php                        | 2 +-
 lib/Sabre/CalDAV/Exception/InvalidComponentType.php          | 2 +-
 lib/Sabre/CalDAV/ICSExportPlugin.php                         | 2 +-
 lib/Sabre/CalDAV/ICalendar.php                               | 2 +-
 lib/Sabre/CalDAV/ICalendarObject.php                         | 2 +-
 lib/Sabre/CalDAV/IShareableCalendar.php                      | 2 +-
 lib/Sabre/CalDAV/ISharedCalendar.php                         | 2 +-
 lib/Sabre/CalDAV/Notifications/Collection.php                | 2 +-
 lib/Sabre/CalDAV/Notifications/ICollection.php               | 2 +-
 lib/Sabre/CalDAV/Notifications/INode.php                     | 2 +-
 lib/Sabre/CalDAV/Notifications/INotificationType.php         | 2 +-
 lib/Sabre/CalDAV/Notifications/Node.php                      | 2 +-
 lib/Sabre/CalDAV/Notifications/Notification/Invite.php       | 2 +-
 lib/Sabre/CalDAV/Notifications/Notification/InviteReply.php  | 2 +-
 lib/Sabre/CalDAV/Notifications/Notification/SystemStatus.php | 2 +-
 lib/Sabre/CalDAV/Plugin.php                                  | 2 +-
 lib/Sabre/CalDAV/Principal/Collection.php                    | 2 +-
 lib/Sabre/CalDAV/Principal/IProxyRead.php                    | 2 +-
 lib/Sabre/CalDAV/Principal/IProxyWrite.php                   | 2 +-
 lib/Sabre/CalDAV/Principal/ProxyRead.php                     | 2 +-
 lib/Sabre/CalDAV/Principal/ProxyWrite.php                    | 2 +-
 lib/Sabre/CalDAV/Principal/User.php                          | 2 +-
 lib/Sabre/CalDAV/Property/AllowedSharingModes.php            | 2 +-
 lib/Sabre/CalDAV/Property/Invite.php                         | 2 +-
 lib/Sabre/CalDAV/Property/ScheduleCalendarTransp.php         | 2 +-
 lib/Sabre/CalDAV/Property/SupportedCalendarComponentSet.php  | 2 +-
 lib/Sabre/CalDAV/Property/SupportedCalendarData.php          | 2 +-
 lib/Sabre/CalDAV/Property/SupportedCollationSet.php          | 2 +-
 lib/Sabre/CalDAV/Schedule/IMip.php                           | 2 +-
 lib/Sabre/CalDAV/Schedule/IOutbox.php                        | 2 +-
 lib/Sabre/CalDAV/Schedule/Outbox.php                         | 2 +-
 lib/Sabre/CalDAV/ShareableCalendar.php                       | 2 +-
 lib/Sabre/CalDAV/SharedCalendar.php                          | 2 +-
 lib/Sabre/CalDAV/SharingPlugin.php                           | 2 +-
 lib/Sabre/CalDAV/UserCalendars.php                           | 2 +-
 lib/Sabre/CardDAV/AddressBook.php                            | 2 +-
 lib/Sabre/CardDAV/AddressBookQueryParser.php                 | 2 +-
 lib/Sabre/CardDAV/AddressBookRoot.php                        | 2 +-
 lib/Sabre/CardDAV/Backend/AbstractBackend.php                | 2 +-
 lib/Sabre/CardDAV/Backend/BackendInterface.php               | 2 +-
 lib/Sabre/CardDAV/Backend/PDO.php                            | 2 +-
 lib/Sabre/CardDAV/Card.php                                   | 2 +-
 lib/Sabre/CardDAV/IAddressBook.php                           | 2 +-
 lib/Sabre/CardDAV/ICard.php                                  | 2 +-
 lib/Sabre/CardDAV/IDirectory.php                             | 2 +-
 lib/Sabre/CardDAV/Plugin.php                                 | 2 +-
 lib/Sabre/CardDAV/Property/SupportedAddressData.php          | 2 +-
 lib/Sabre/CardDAV/UserAddressBooks.php                       | 2 +-
 lib/Sabre/CardDAV/VCFExportPlugin.php                        | 2 +-
 lib/Sabre/DAV/Auth/Backend/AbstractBasic.php                 | 2 +-
 lib/Sabre/DAV/Auth/Backend/AbstractDigest.php                | 2 +-
 lib/Sabre/DAV/Auth/Backend/Apache.php                        | 2 +-
 lib/Sabre/DAV/Auth/Backend/BackendInterface.php              | 2 +-
 lib/Sabre/DAV/Auth/Backend/File.php                          | 2 +-
 lib/Sabre/DAV/Auth/Backend/PDO.php                           | 2 +-
 lib/Sabre/DAV/Auth/Plugin.php                                | 2 +-
 lib/Sabre/DAV/Browser/GuessContentType.php                   | 2 +-
 lib/Sabre/DAV/Browser/MapGetToPropFind.php                   | 2 +-
 lib/Sabre/DAV/Browser/Plugin.php                             | 2 +-
 lib/Sabre/DAV/Client.php                                     | 2 +-
 lib/Sabre/DAV/Collection.php                                 | 2 +-
 lib/Sabre/DAV/Exception.php                                  | 2 +-
 lib/Sabre/DAV/Exception/BadRequest.php                       | 2 +-
 lib/Sabre/DAV/Exception/Conflict.php                         | 2 +-
 lib/Sabre/DAV/Exception/ConflictingLock.php                  | 2 +-
 lib/Sabre/DAV/Exception/FileNotFound.php                     | 2 +-
 lib/Sabre/DAV/Exception/Forbidden.php                        | 2 +-
 lib/Sabre/DAV/Exception/InsufficientStorage.php              | 2 +-
 lib/Sabre/DAV/Exception/InvalidResourceType.php              | 2 +-
 lib/Sabre/DAV/Exception/LockTokenMatchesRequestUri.php       | 2 +-
 lib/Sabre/DAV/Exception/Locked.php                           | 2 +-
 lib/Sabre/DAV/Exception/MethodNotAllowed.php                 | 2 +-
 lib/Sabre/DAV/Exception/NotAuthenticated.php                 | 2 +-
 lib/Sabre/DAV/Exception/NotFound.php                         | 2 +-
 lib/Sabre/DAV/Exception/NotImplemented.php                   | 2 +-
 lib/Sabre/DAV/Exception/PaymentRequired.php                  | 2 +-
 lib/Sabre/DAV/Exception/PreconditionFailed.php               | 2 +-
 lib/Sabre/DAV/Exception/ReportNotSupported.php               | 2 +-
 lib/Sabre/DAV/Exception/RequestedRangeNotSatisfiable.php     | 2 +-
 lib/Sabre/DAV/Exception/ServiceUnavailable.php               | 2 +-
 lib/Sabre/DAV/Exception/UnsupportedMediaType.php             | 2 +-
 lib/Sabre/DAV/FS/Directory.php                               | 2 +-
 lib/Sabre/DAV/FS/File.php                                    | 2 +-
 lib/Sabre/DAV/FS/Node.php                                    | 2 +-
 lib/Sabre/DAV/FSExt/Directory.php                            | 2 +-
 lib/Sabre/DAV/FSExt/File.php                                 | 2 +-
 lib/Sabre/DAV/FSExt/Node.php                                 | 2 +-
 lib/Sabre/DAV/File.php                                       | 2 +-
 lib/Sabre/DAV/ICollection.php                                | 2 +-
 lib/Sabre/DAV/IExtendedCollection.php                        | 2 +-
 lib/Sabre/DAV/IFile.php                                      | 2 +-
 lib/Sabre/DAV/INode.php                                      | 2 +-
 lib/Sabre/DAV/IProperties.php                                | 2 +-
 lib/Sabre/DAV/IQuota.php                                     | 2 +-
 lib/Sabre/DAV/Locks/Backend/AbstractBackend.php              | 2 +-
 lib/Sabre/DAV/Locks/Backend/BackendInterface.php             | 2 +-
 lib/Sabre/DAV/Locks/Backend/FS.php                           | 2 +-
 lib/Sabre/DAV/Locks/Backend/File.php                         | 2 +-
 lib/Sabre/DAV/Locks/Backend/PDO.php                          | 2 +-
 lib/Sabre/DAV/Locks/LockInfo.php                             | 2 +-
 lib/Sabre/DAV/Locks/Plugin.php                               | 2 +-
 lib/Sabre/DAV/Mount/Plugin.php                               | 2 +-
 lib/Sabre/DAV/Node.php                                       | 2 +-
 lib/Sabre/DAV/ObjectTree.php                                 | 2 +-
 lib/Sabre/DAV/PartialUpdate/IFile.php                        | 2 +-
 lib/Sabre/DAV/PartialUpdate/Plugin.php                       | 2 +-
 lib/Sabre/DAV/Property.php                                   | 2 +-
 lib/Sabre/DAV/Property/GetLastModified.php                   | 2 +-
 lib/Sabre/DAV/Property/Href.php                              | 2 +-
 lib/Sabre/DAV/Property/HrefList.php                          | 2 +-
 lib/Sabre/DAV/Property/IHref.php                             | 2 +-
 lib/Sabre/DAV/Property/LockDiscovery.php                     | 2 +-
 lib/Sabre/DAV/Property/ResourceType.php                      | 2 +-
 lib/Sabre/DAV/Property/Response.php                          | 2 +-
 lib/Sabre/DAV/Property/ResponseList.php                      | 2 +-
 lib/Sabre/DAV/Property/SupportedLock.php                     | 2 +-
 lib/Sabre/DAV/Property/SupportedReportSet.php                | 2 +-
 lib/Sabre/DAV/PropertyInterface.php                          | 2 +-
 lib/Sabre/DAV/Server.php                                     | 2 +-
 lib/Sabre/DAV/ServerPlugin.php                               | 2 +-
 lib/Sabre/DAV/SimpleCollection.php                           | 2 +-
 lib/Sabre/DAV/SimpleFile.php                                 | 2 +-
 lib/Sabre/DAV/StringUtil.php                                 | 2 +-
 lib/Sabre/DAV/TemporaryFileFilterPlugin.php                  | 2 +-
 lib/Sabre/DAV/Tree.php                                       | 2 +-
 lib/Sabre/DAV/Tree/Filesystem.php                            | 2 +-
 lib/Sabre/DAV/URLUtil.php                                    | 2 +-
 lib/Sabre/DAV/UUIDUtil.php                                   | 2 +-
 lib/Sabre/DAV/Version.php                                    | 2 +-
 lib/Sabre/DAV/XMLUtil.php                                    | 2 +-
 lib/Sabre/DAVACL/AbstractPrincipalCollection.php             | 2 +-
 lib/Sabre/DAVACL/Exception/AceConflict.php                   | 2 +-
 lib/Sabre/DAVACL/Exception/NeedPrivileges.php                | 2 +-
 lib/Sabre/DAVACL/Exception/NoAbstract.php                    | 2 +-
 lib/Sabre/DAVACL/Exception/NotRecognizedPrincipal.php        | 2 +-
 lib/Sabre/DAVACL/Exception/NotSupportedPrivilege.php         | 2 +-
 lib/Sabre/DAVACL/IACL.php                                    | 2 +-
 lib/Sabre/DAVACL/IPrincipal.php                              | 2 +-
 lib/Sabre/DAVACL/IPrincipalCollection.php                    | 2 +-
 lib/Sabre/DAVACL/Plugin.php                                  | 2 +-
 lib/Sabre/DAVACL/Principal.php                               | 2 +-
 lib/Sabre/DAVACL/PrincipalBackend/AbstractBackend.php        | 2 +-
 lib/Sabre/DAVACL/PrincipalBackend/BackendInterface.php       | 2 +-
 lib/Sabre/DAVACL/PrincipalBackend/PDO.php                    | 2 +-
 lib/Sabre/DAVACL/PrincipalCollection.php                     | 2 +-
 lib/Sabre/DAVACL/Property/Acl.php                            | 2 +-
 lib/Sabre/DAVACL/Property/AclRestrictions.php                | 2 +-
 lib/Sabre/DAVACL/Property/CurrentUserPrivilegeSet.php        | 2 +-
 lib/Sabre/DAVACL/Property/Principal.php                      | 2 +-
 lib/Sabre/DAVACL/Property/SupportedPrivilegeSet.php          | 2 +-
 lib/Sabre/autoload.php                                       | 2 +-
 tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDTest.php       | 2 +-
 tests/Sabre/CalDAV/ExpandEventsDTSTARTandDTENDbyDayTest.php  | 2 +-
 tests/Sabre/CalDAV/ExpandEventsDoubleEventsTest.php          | 2 +-
 tests/Sabre/CalDAV/GetEventsByTimerangeTest.php              | 2 +-
 tests/Sabre/CalDAV/Issue203Test.php                          | 2 +-
 tests/Sabre/CalDAV/Issue205Test.php                          | 2 +-
 tests/Sabre/CalDAV/Issue211Test.php                          | 2 +-
 tests/Sabre/CalDAV/Issue220Test.php                          | 2 +-
 tests/Sabre/CalDAV/Issue228Test.php                          | 2 +-
 tests/Sabre/CalDAV/Schedule/IMip/Mock.php                    | 2 +-
 tests/Sabre/DAVServerTest.php                                | 2 +-
 171 files changed, 171 insertions(+), 171 deletions(-)

diff --cc lib/Sabre/CalDAV/Backend/PDO.php
index 72ff08b,2e93a7b..3af2aec
--- a/lib/Sabre/CalDAV/Backend/PDO.php
+++ b/lib/Sabre/CalDAV/Backend/PDO.php
@@@ -16,9 -14,9 +16,9 @@@ us
   *
   * @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 PDO extends AbstractBackend {
 +class PDO extends AbstractBackend implements SyncSupport, SubscriptionSupport {
  
      /**
       * We need to specify a max date, because we need to stop *somewhere*
diff --cc lib/Sabre/CalDAV/Calendar.php
index 1fae32b,74fa15b..87bcda5
--- a/lib/Sabre/CalDAV/Calendar.php
+++ b/lib/Sabre/CalDAV/Calendar.php
@@@ -14,9 -13,9 +14,9 @@@ us
   *
   * @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 Calendar implements ICalendar, DAV\IProperties, DAVACL\IACL {
 +class Calendar implements ICalendar, DAV\IProperties, DAVACL\IACL, DAV\Sync\ISyncCollection, DAV\IMultiGet {
  
      /**
       * This is an array with calendar information
diff --cc lib/Sabre/CalDAV/ICSExportPlugin.php
index 91330e5,bba7fbd..f2bdf5b
--- a/lib/Sabre/CalDAV/ICSExportPlugin.php
+++ b/lib/Sabre/CalDAV/ICSExportPlugin.php
@@@ -17,32 -12,9 +17,32 @@@ us
   * This is useful for clients that don't support CalDAV yet. They often do
   * support ics files.
   *
 + * To use this, point a http client to a caldav calendar, and add ?expand to
 + * the url.
 + *
 + * Further options that can be added to the url:
 + *   start=123456789 - Only return events after the given unix timestamp
 + *   end=123245679   - Only return events from before the given unix timestamp
 + *   expand=1        - Strip timezone information and expand recurring events.
 + *                     If you'd like to expand, you _must_ also specify start
 + *                     and end.
 + *
 + * By default this plugin returns data in the text/calendar format (iCalendar
 + * 2.0). If you'd like to receive jCal data instead, you can use an Accept
 + * header:
 + *
 + * Accept: application/calendar+json
 + *
 + * Alternatively, you can also specify this in the url using
 + * accept=application/calendar+json, or accept=jcal for short. If the url
 + * parameter and Accept header is specified, the url parameter wins.
 + *
 + * Note that specifying a start or end data implies that only events will be
 + * returned. VTODO and VJOURNAL will be stripped.
 + *
   * @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 ICSExportPlugin extends DAV\ServerPlugin {
  
diff --cc lib/Sabre/CardDAV/AddressBook.php
index ce7f32e,399f38e..6e17add
--- a/lib/Sabre/CardDAV/AddressBook.php
+++ b/lib/Sabre/CardDAV/AddressBook.php
@@@ -13,9 -12,9 +13,9 @@@ us
   *
   * @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 AddressBook extends DAV\Collection implements IAddressBook, DAV\IProperties, DAVACL\IACL {
 +class AddressBook extends DAV\Collection implements IAddressBook, DAV\IProperties, DAVACL\IACL, DAV\Sync\ISyncCollection, DAV\IMultiGet {
  
      /**
       * This is an array with addressbook information
diff --cc lib/Sabre/CardDAV/Backend/PDO.php
index b3531a4,67e0ae3..f404787
--- a/lib/Sabre/CardDAV/Backend/PDO.php
+++ b/lib/Sabre/CardDAV/Backend/PDO.php
@@@ -12,9 -12,9 +12,9 @@@ use Sabre\DAV
   *
   * @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 PDO extends AbstractBackend {
 +class PDO extends AbstractBackend implements SyncSupport {
  
      /**
       * PDO connection
diff --cc lib/Sabre/DAV/Client.php
index b182047,705b321..471c627
--- a/lib/Sabre/DAV/Client.php
+++ b/lib/Sabre/DAV/Client.php
@@@ -14,9 -12,9 +14,9 @@@ use Sabre\HTTP
   *
   * @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 Client {
 +class Client extends HTTP\Client {
  
      /**
       * The propertyMap is a key-value array.
diff --cc lib/Sabre/DAV/Server.php
index 588feca,e0a68ab..a44f4e5
--- a/lib/Sabre/DAV/Server.php
+++ b/lib/Sabre/DAV/Server.php
@@@ -14,9 -8,9 +14,9 @@@ us
   *
   * @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 Server {
 +class Server extends EventEmitter {
  
      /**
       * Infinity is used for some request supporting the HTTP Depth header and indicates that the operation should traverse the entire tree
diff --cc lib/Sabre/DAV/URLUtil.php
index eee51ed,b7254e9..544e2e6
--- a/lib/Sabre/DAV/URLUtil.php
+++ b/lib/Sabre/DAV/URLUtil.php
@@@ -2,21 -2,123 +2,21 @@@
  
  namespace Sabre\DAV;
  
 +use Sabre\HTTP;
 +
  /**
 - * URL utility class
 - *
 - * This class provides methods to deal with encoding and decoding url (percent encoded) strings.
 - *
 - * It was not possible to use PHP's built-in methods for this, because some clients don't like
 - * encoding of certain characters.
 - *
 - * Specifically, it was found that GVFS (gnome's webdav client) does not like encoding of ( and
 - * ). Since these are reserved, but don't have a reserved meaning in url, these characters are
 - * kept as-is.
 + * URLUtil
   *
 - * It was also discovered that versions of the SOGO connector for thunderbird
 - * has issues with urlencoded colons.
 + * This file moved to the HTTP package and is now deprecated. Use 
 + * Sabre\HTTP\URLUtil instead.
   *
 - * @copyright Copyright (C) 2007-2014 fruux GmbH (https://fruux.com/).
 - * @author Evert Pot (http://evertpot.com/)
 + * This file will be removed in a future version. 
 + * 
 + * @copyright Copyright (C) 2007-2014 fruux GmbH. All rights reserved.
 + * @author Evert Pot (http://evertpot.com/) 
 + * @deprecated Use Sabre\HTTP\URLUtil instead!
-  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+  * @license http://sabre.io/license/ Modified BSD License
   */
 -class URLUtil {
 -
 -    /**
 -     * Encodes the path of a url.
 -     *
 -     * slashes (/) are treated as path-separators.
 -     *
 -     * @param string $path
 -     * @return string
 -     */
 -    static function encodePath($path) {
 -
 -        return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\)\/:])/',function($match) {
 -
 -            return '%'.sprintf('%02x',ord($match[0]));
 -
 -        }, $path);
 -
 -    }
 -
 -    /**
 -     * Encodes a 1 segment of a path
 -     *
 -     * Slashes are considered part of the name, and are encoded as %2f
 -     *
 -     * @param string $pathSegment
 -     * @return string
 -     */
 -    static function encodePathSegment($pathSegment) {
 -
 -        return preg_replace_callback('/([^A-Za-z0-9_\-\.~\(\):])/',function($match) {
 -
 -            return '%'.sprintf('%02x',ord($match[0]));
 -
 -        }, $pathSegment);
 -    }
 -
 -    /**
 -     * Decodes a url-encoded path
 -     *
 -     * @param string $path
 -     * @return string
 -     */
 -    static function decodePath($path) {
 -
 -        return self::decodePathSegment($path);
 -
 -    }
 -
 -    /**
 -     * Decodes a url-encoded path segment
 -     *
 -     * @param string $path
 -     * @return string
 -     */
 -    static function decodePathSegment($path) {
 -
 -        $path = rawurldecode($path);
 -        $encoding = mb_detect_encoding($path, array('UTF-8','ISO-8859-1'));
 -
 -        switch($encoding) {
 -
 -            case 'ISO-8859-1' :
 -                $path = utf8_encode($path);
 -
 -        }
 -
 -        return $path;
 -
 -    }
 -
 -    /**
 -     * Returns the 'dirname' and 'basename' for a path.
 -     *
 -     * The reason there is a custom function for this purpose, is because
 -     * basename() is locale aware (behaviour changes if C locale or a UTF-8 locale is used)
 -     * and we need a method that just operates on UTF-8 characters.
 -     *
 -     * In addition basename and dirname are platform aware, and will treat backslash (\) as a
 -     * directory separator on windows.
 -     *
 -     * This method returns the 2 components as an array.
 -     *
 -     * If there is no dirname, it will return an empty string. Any / appearing at the end of the
 -     * string is stripped off.
 -     *
 -     * @param string $path
 -     * @return array
 -     */
 -    static function splitPath($path) {
 -
 -        $matches = array();
 -        if(preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u',$path,$matches)) {
 -            return array($matches[1],$matches[2]);
 -        } else {
 -            return array(null,null);
 -        }
 -
 -    }
 +class URLUtil extends HTTP\URLUtil {
  
  }
diff --cc tests/Sabre/CalDAV/Issue203Test.php
index 9b8b55d,21ee2f5..36459f2
--- a/tests/Sabre/CalDAV/Issue203Test.php
+++ b/tests/Sabre/CalDAV/Issue203Test.php
@@@ -7,9 -7,10 +7,9 @@@ use Sabre\VObject
  /**
   * This unittest is created to find out why an overwritten DAILY event has wrong DTSTART, DTEND, SUMMARY and RECURRENCEID
   *
 - *
 - * @copyright Copyright (C) 2007-2014 Rooftop Solutions. All rights reserved.
 + * @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 Issue203Test extends \Sabre\DAVServerTest {
  

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



More information about the Pkg-owncloud-commits mailing list