From 0b02a6d123b2014705998c94ddf3d460948d3eac Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Tue, 10 May 2016 17:26:44 -0700
Subject: initial sabre upgrade (needs lots of work - to wit: authentication,
 redo the browser interface, and rework event export/import)

---
 vendor/sabre/uri/lib/Version.php   |  19 +++
 vendor/sabre/uri/lib/functions.php | 282 +++++++++++++++++++++++++++++++++++++
 2 files changed, 301 insertions(+)
 create mode 100644 vendor/sabre/uri/lib/Version.php
 create mode 100644 vendor/sabre/uri/lib/functions.php

(limited to 'vendor/sabre/uri/lib')

diff --git a/vendor/sabre/uri/lib/Version.php b/vendor/sabre/uri/lib/Version.php
new file mode 100644
index 000000000..88678d4d5
--- /dev/null
+++ b/vendor/sabre/uri/lib/Version.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Sabre\Uri;
+
+/**
+ * This class contains the version number for this package.
+ *
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/
+ */
+class Version {
+
+    /**
+     * Full version number
+     */
+    const VERSION = '1.1.0';
+
+}
diff --git a/vendor/sabre/uri/lib/functions.php b/vendor/sabre/uri/lib/functions.php
new file mode 100644
index 000000000..06181aef0
--- /dev/null
+++ b/vendor/sabre/uri/lib/functions.php
@@ -0,0 +1,282 @@
+<?php
+
+namespace Sabre\Uri;
+
+/**
+ * This file contains all the uri handling functions.
+ *
+ * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
+ * @author Evert Pot (http://evertpot.com/)
+ * @license http://sabre.io/license/
+ */
+
+/**
+ * Resolves relative urls, like a browser would.
+ *
+ * This function takes a basePath, which itself _may_ also be relative, and
+ * then applies the relative path on top of it.
+ *
+ * @param string $basePath
+ * @param string $newPath
+ * @return string
+ */
+function resolve($basePath, $newPath) {
+
+    $base = parse($basePath);
+    $delta = parse($newPath);
+
+    $pick = function($part) use ($base, $delta) {
+
+        if ($delta[$part]) {
+            return $delta[$part];
+        } elseif ($base[$part]) {
+            return $base[$part];
+        }
+        return null;
+
+    };
+
+    // If the new path defines a scheme, it's absolute and we can just return
+    // that.
+    if ($delta['scheme']) {
+        return build($delta);
+    }
+
+    $newParts = [];
+
+    $newParts['scheme'] = $pick('scheme');
+    $newParts['host']   = $pick('host');
+    $newParts['port']   = $pick('port');
+
+    $path = '';
+    if ($delta['path']) {
+        // If the path starts with a slash
+        if ($delta['path'][0] === '/') {
+            $path = $delta['path'];
+        } else {
+            // Removing last component from base path.
+            $path = $base['path'];
+            if (strpos($path, '/') !== false) {
+                $path = substr($path, 0, strrpos($path, '/'));
+            }
+            $path .= '/' . $delta['path'];
+        }
+    } else {
+        $path = $base['path'] ?: '/';
+    }
+    // Removing .. and .
+    $pathParts = explode('/', $path);
+    $newPathParts = [];
+    foreach ($pathParts as $pathPart) {
+
+        switch ($pathPart) {
+            //case '' :
+            case '.' :
+                break;
+            case '..' :
+                array_pop($newPathParts);
+                break;
+            default :
+                $newPathParts[] = $pathPart;
+                break;
+        }
+    }
+
+    $path = implode('/', $newPathParts);
+
+    // If the source url ended with a /, we want to preserve that.
+    $newParts['path'] = $path;
+    if ($delta['query']) {
+        $newParts['query'] = $delta['query'];
+    } elseif (!empty($base['query']) && empty($delta['host']) && empty($delta['path'])) {
+        // Keep the old query if host and path didn't change
+        $newParts['query'] = $base['query'];
+    }
+    if ($delta['fragment']) {
+        $newParts['fragment'] = $delta['fragment'];
+    }
+    return build($newParts);
+
+}
+
+/**
+ * Takes a URI or partial URI as its argument, and normalizes it.
+ *
+ * After normalizing a URI, you can safely compare it to other URIs.
+ * This function will for instance convert a %7E into a tilde, according to
+ * rfc3986.
+ *
+ * It will also change a %3a into a %3A.
+ *
+ * @param string $uri
+ * @return string
+ */
+function normalize($uri) {
+
+    $parts = parse($uri);
+
+    if (!empty($parts['path'])) {
+        $pathParts = explode('/', ltrim($parts['path'], '/'));
+        $newPathParts = [];
+        foreach ($pathParts as $pathPart) {
+            switch ($pathPart) {
+                case '.':
+                    // skip
+                    break;
+                case '..' :
+                    // One level up in the hierarchy
+                    array_pop($newPathParts);
+                    break;
+                default :
+                    // Ensuring that everything is correctly percent-encoded.
+                    $newPathParts[] = rawurlencode(rawurldecode($pathPart));
+                    break;
+            }
+        }
+        $parts['path'] = '/' . implode('/', $newPathParts);
+    }
+
+    if ($parts['scheme']) {
+        $parts['scheme'] = strtolower($parts['scheme']);
+        $defaultPorts = [
+            'http'  => '80',
+            'https' => '443',
+        ];
+
+        if (!empty($parts['port']) && isset($defaultPorts[$parts['scheme']]) && $defaultPorts[$parts['scheme']] == $parts['port']) {
+            // Removing default ports.
+            unset($parts['port']);
+        }
+        // A few HTTP specific rules.
+        switch ($parts['scheme']) {
+            case 'http' :
+            case 'https' :
+                if (empty($parts['path'])) {
+                    // An empty path is equivalent to / in http.
+                    $parts['path'] = '/';
+                }
+                break;
+        }
+    }
+
+    if ($parts['host']) $parts['host'] = strtolower($parts['host']);
+
+    return build($parts);
+
+}
+
+/**
+ * Parses a URI and returns its individual components.
+ *
+ * This method largely behaves the same as PHP's parse_url, except that it will
+ * return an array with all the array keys, including the ones that are not
+ * set by parse_url, which makes it a bit easier to work with.
+ *
+ * Unlike PHP's parse_url, it will also convert any non-ascii characters to
+ * percent-encoded strings. PHP's parse_url corrupts these characters on OS X.
+ *
+ * @param string $uri
+ * @return array
+ */
+function parse($uri) {
+
+    // Normally a URI must be ASCII, however. However, often it's not and
+    // parse_url might corrupt these strings.
+    //
+    // For that reason we take any non-ascii characters from the uri and
+    // uriencode them first.
+    $uri = preg_replace_callback(
+        '/[^[:ascii:]]/u',
+        function($matches) {
+            return rawurlencode($matches[0]);
+        },
+        $uri
+    );
+
+    return
+        parse_url($uri) + [
+            'scheme'   => null,
+            'host'     => null,
+            'path'     => null,
+            'port'     => null,
+            'user'     => null,
+            'query'    => null,
+            'fragment' => null,
+        ];
+
+}
+
+/**
+ * This function takes the components returned from PHP's parse_url, and uses
+ * it to generate a new uri.
+ *
+ * @param array $parts
+ * @return string
+ */
+function build(array $parts) {
+
+    $uri = '';
+
+    $authority = '';
+    if (!empty($parts['host'])) {
+        $authority = $parts['host'];
+        if (!empty($parts['user'])) {
+            $authority = $parts['user'] . '@' . $authority;
+        }
+        if (!empty($parts['port'])) {
+            $authority = $authority . ':' . $parts['port'];
+        }
+    }
+
+    if (!empty($parts['scheme'])) {
+        // If there's a scheme, there's also a host.
+        $uri = $parts['scheme'] . ':';
+
+    }
+    if ($authority) {
+        // No scheme, but there is a host.
+        $uri .= '//' . $authority;
+
+    }
+
+    if (!empty($parts['path'])) {
+        $uri .= $parts['path'];
+    }
+    if (!empty($parts['query'])) {
+        $uri .= '?' . $parts['query'];
+    }
+    if (!empty($parts['fragment'])) {
+        $uri .= '#' . $parts['fragment'];
+    }
+
+    return $uri;
+
+}
+
+/**
+ * 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
+ */
+function split($path) {
+
+    $matches = [];
+    if (preg_match('/^(?:(?:(.*)(?:\/+))?([^\/]+))(?:\/?)$/u', $path, $matches)) {
+        return [$matches[1], $matches[2]];
+    }
+    return [null,null];
+
+}
-- 
cgit v1.2.3